[SCM] zita-resampler/master: Patch apps/Makefile to set the proper path of the headers and link against libzita-resampler0.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 20 14:36:46 UTC 2010


The following commit has been merged in the master branch:
commit 6033597576817f91b24eee297f3a6181dc085927
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 20 16:35:29 2010 +0200

    Patch apps/Makefile to set the proper path of the headers and link against libzita-resampler0.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 4c3a06c..e2465e3 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -4,13 +4,13 @@ Description: Set PREFIX properly.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 ---
- apps/Makefile |    4 ++--
+ apps/Makefile |    8 ++++----
  libs/Makefile |   16 ++++++++--------
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ 2 files changed, 12 insertions(+), 12 deletions(-)
 
---- zita-resampler-0.1.1.orig/apps/Makefile
-+++ zita-resampler-0.1.1/apps/Makefile
-@@ -19,9 +19,9 @@
+--- zita-resampler.orig/apps/Makefile
++++ zita-resampler/apps/Makefile
+@@ -19,13 +19,13 @@
  # --------------------------------------------------------------------------
  
  
@@ -21,9 +21,15 @@ Forwarded: not-needed
 +LIBDIR = lib
  DISTDIR = resample-$(VERSION)
  VERSION = 0.4.0
- LDFLAGS += -L$(PREFIX)/$(LIBDIR)
---- zita-resampler-0.1.1.orig/libs/Makefile
-+++ zita-resampler-0.1.1/libs/Makefile
+-LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+-CPPFLAGS += -O3 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
++LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L$(DESTDIR)$(PREFIX)/$(LIBDIR)
++CPPFLAGS += -O3 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -I$(DESTDIR)$(PREFIX)/include
+ #CPPFLAGS += -march=native
+ 
+ 
+--- zita-resampler.orig/libs/Makefile
++++ zita-resampler/libs/Makefile
 @@ -17,9 +17,9 @@
  
  # Modify as required.

-- 
zita-resampler packaging



More information about the pkg-multimedia-commits mailing list