[SCM] lilv/master: Patches forwarded.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Jan 4 21:37:38 UTC 2017


The following commit has been merged in the master branch:
commit 33bc12fddd1b447b3034390bc308f74eff21ced7
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jan 4 22:31:29 2017 +0100

    Patches forwarded.

diff --git a/debian/patches/1001-dont_run_ldconfig.patch b/debian/patches/1001-dont_run_ldconfig.patch
index 5ca8f6b..0e97abc 100644
--- a/debian/patches/1001-dont_run_ldconfig.patch
+++ b/debian/patches/1001-dont_run_ldconfig.patch
@@ -1,7 +1,7 @@
 Description: Don't run ldconfig after calling the install target
  and save a bit of time.
 Author: Alessio Treglia <alessio at debian.org>
-Forwarded: not-needed
+Forwarded: David Robillard <d at drobilla.net>
 ---
  wscript |    1 -
  1 file changed, 1 deletion(-)
diff --git a/debian/patches/1002-fix_gnu_kfreebsd_build.patch b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
index f4fb19e..847e106 100644
--- a/debian/patches/1002-fix_gnu_kfreebsd_build.patch
+++ b/debian/patches/1002-fix_gnu_kfreebsd_build.patch
@@ -4,30 +4,30 @@ Subject: Fix build on GNU/kFreeBSD
 * Still need to link with -ldl, unlike regular BSD
 * Remove extraneous -llilv, which swig2.0 on BSD-like systems would
   fopen() even though it is a directory
-
+Forwarded: David Robillard <d at drobilla.net>
 ---
- wscript |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ wscript |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: lilv/wscript
-===================================================================
---- lilv.orig/wscript
-+++ lilv/wscript
-@@ -221,7 +221,7 @@ def build(bld):
-     if bld.env.MSVC_COMPILER:
-         libflags = []
-         defines  = ['snprintf=_snprintf']
--    elif bld.env.DEST_OS.find('bsd') > 0:
-+    elif bld.env.DEST_OS.find('bsd') > 0 and sys.platform.find('gnu') < 0:
-         lib = []
- 
-     # Pkgconfig file
-@@ -398,7 +398,7 @@ def build(bld):
-                   source     = 'bindings/lilv.i',
-                   target     = 'bindings/_lilv',
-                   includes   = ['..'],
--                  swig_flags = '-c++ -python %s -Wall -I.. -llilv -features autodoc=1' %
-+                  swig_flags = '-c++ -python %s -Wall -I.. -features autodoc=1' %
-                                ("-py3" if sys.version_info >= (3,0,0) else ""),
-                   use        = 'liblilv')
-         autowaf.use_lib(bld, obj, 'LILV')
+Index: lilv/wscript
+===================================================================
+--- lilv.orig/wscript
++++ lilv/wscript
+@@ -221,7 +221,7 @@ def build(bld):
+     if bld.env.MSVC_COMPILER:
+         libflags = []
+         defines  = ['snprintf=_snprintf']
+-    elif bld.env.DEST_OS.find('bsd') > 0:
++    elif bld.env.DEST_OS.find('bsd') > 0 and sys.platform.find('gnu') < 0:
+         lib = []
+ 
+     # Pkgconfig file
+@@ -398,7 +398,7 @@ def build(bld):
+                   source     = 'bindings/lilv.i',
+                   target     = 'bindings/_lilv',
+                   includes   = ['..'],
+-                  swig_flags = '-c++ -python %s -Wall -I.. -llilv -features autodoc=1' %
++                  swig_flags = '-c++ -python %s -Wall -I.. -features autodoc=1' %
+                                ("-py3" if sys.version_info >= (3,0,0) else ""),
+                   use        = 'liblilv')
+         autowaf.use_lib(bld, obj, 'LILV')

-- 
lilv packaging



More information about the pkg-multimedia-commits mailing list