pool/audacity
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 481031 from home:plater

Browse Source 
Fix patches

OBS-URL: https://build.opensuse.org/request/show/481031
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=97
This commit is contained in:
Dave Plater 2017-03-18 16:47:01 +00:00 committed by Git OBS Bridge
parent d22ca099a0
commit 8e1b36c8b7
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audacity-flac_assert.h.patch → audacity-flacversion.patch
View File

@ -1,22 +1,24 @@
--- a/m4/audacity_checklib_libflac.m4 Index: m4/audacity_checklib_libflac.m4
+++ b/m4/audacity_checklib_libflac.m4 ===================================================================
--- m4/audacity_checklib_libflac.m4.orig 2017-03-13 23:02:21.000000000 +0200
+++ m4/audacity_checklib_libflac.m4 2017-03-18 18:39:01.009659215 +0200
@@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ @@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
dnl See if FLAC is installed in the system dnl See if FLAC is installed in the system
- PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0], - PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0],
+ PKG_CHECK_MODULES([FLAC], [flac >= 1.5.0 flac++ >= 1.5.0], + PKG_CHECK_MODULES([FLAC], [flac >= 1.3.1 flac++ >= 1.3.1],
[LIBFLAC_SYSTEM_AVAILABLE="yes"], [LIBFLAC_SYSTEM_AVAILABLE="yes"],
[LIBFLAC_SYSTEM_AVAILABLE="no"]) [LIBFLAC_SYSTEM_AVAILABLE="no"])
- dnl Check for flac < 1.3.0 - dnl Check for flac < 1.3.0
+ dnl Check for flac < 1.5.0 + dnl Check for flac < 1.3.1
if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then
PKG_CHECK_MODULES([FLAC], [flac flac++], PKG_CHECK_MODULES([FLAC], [flac flac++],
[LIBFLAC_SYSTEM_AVAILABLE="yes"], [LIBFLAC_SYSTEM_AVAILABLE="yes"],
[LIBFLAC_SYSTEM_AVAILABLE="no"]) [LIBFLAC_SYSTEM_AVAILABLE="no"])
- dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search - dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search
+ dnl flac < 1.5.0 adds its own FLAC and FLAC++ subdirectories to the search + dnl flac < 1.3.1 adds its own FLAC and FLAC++ subdirectories to the search
dnl path and ships a assert.h file there. This assert.h overwrites the dnl path and ships a assert.h file there. This assert.h overwrites the
dnl assert.h header from the C standard library. We need to strip /FLAC dnl assert.h header from the C standard library. We need to strip /FLAC
dnl and /FLAC++ from the include paths to make the assert.h from the C dnl and /FLAC++ from the include paths to make the assert.h from the C

5
audacity.changes
View File

@ -4,8 +4,11 @@ Sat Mar 18 13:53:54 UTC 2017 - davejplater@gmail.com
- Update to release 2.1.3 - Update to release 2.1.3
- Recreated audacity-no_buildstamp.patch with 2.1.3 release date - Recreated audacity-no_buildstamp.patch with 2.1.3 release date
and time. and time.
- Added audacity-flacversion.patch to fix minimum version in m4
macro.
- Rebased audacity-fix-nonsense.patch - Rebased audacity-fix-nonsense.patch
- Deleted audacity-ffmpeg.patch and audacity-gcc6.patch - Deleted audacity-ffmpeg.patch, audacity-flac_assert.h.patch and
audacity-gcc6.patch
- Upstream changes: - Upstream changes:
* Interface: * Interface:
* Pinned option on waveform so waveform moves and * Pinned option on waveform so waveform moves and

8
audacity.spec
View File

@ -34,8 +34,8 @@ Source1: %{name}-license-nyquist
Source2: %{name}-rpmlintrc Source2: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp. # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejplater@gmail.com -- Remove the buildstamp.
Patch0: %{name}-no_buildstamp.patch Patch0: %{name}-no_buildstamp.patch
# PATCH-FIX-OPENSUSE audacity-flac_assert.h.patch joerg.lorenzen@ki.tng.de -- Patch to fix build against libflac 1.3.0+. # PATCH-FIX-OPENSUSE audacity-flacversion.patch davejplater@gmail.com -- Patch to fix build against libflac 1.3.1+.
Patch1: %{name}-flac_assert.h.patch Patch1: %{name}-flacversion.patch
# PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason. # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason.
Patch2: %{name}-fix-nonsense.patch Patch2: %{name}-fix-nonsense.patch
BuildRequires: autoconf BuildRequires: autoconf
@ -106,9 +106,9 @@ than the physical memory size of your computer.
%prep %prep
%setup -q -n %{name}-Audacity-%{version} %setup -q -n %{name}-Audacity-%{version}
%patch0 %patch0
%patch1 -p1 %patch1 -p0
%patch2 -p0 %patch2 -p0
#%%patch5
cp -f %{SOURCE1} LICENSE_NYQUIST.txt cp -f %{SOURCE1} LICENSE_NYQUIST.txt
# Make sure we use the system versions. # Make sure we use the system versions.
rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/