[SCM] calf/master: Migrate from lv2core to lv2-dev.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed May 16 20:25:27 UTC 2012


The following commit has been merged in the master branch:
commit 47efe3d996686dfbc49356a4c6de69882fdecc06
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 16 22:24:51 2012 +0200

    Migrate from lv2core to lv2-dev.

diff --git a/debian/patches/1002-lv2core_to_lv2.patch b/debian/patches/1002-lv2core_to_lv2.patch
new file mode 100644
index 0000000..36d1da8
--- /dev/null
+++ b/debian/patches/1002-lv2core_to_lv2.patch
@@ -0,0 +1,62 @@
+---
+ configure    |   16 ++++++++--------
+ configure.ac |    2 +-
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+--- calf.orig/configure
++++ calf/configure
+@@ -15198,12 +15198,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_LV2_DEPS_CFLAGS="$LV2_DEPS_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2core >= 1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lv2core >= 1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 >= 1.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lv2 >= 1.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LV2_DEPS_CFLAGS=`$PKG_CONFIG --cflags "lv2core >= 1" 2>/dev/null`
++  pkg_cv_LV2_DEPS_CFLAGS=`$PKG_CONFIG --cflags "lv2 >= 1.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -15216,12 +15216,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_LV2_DEPS_LIBS="$LV2_DEPS_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2core >= 1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "lv2core >= 1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 >= 1.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "lv2 >= 1.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LV2_DEPS_LIBS=`$PKG_CONFIG --libs "lv2core >= 1" 2>/dev/null`
++  pkg_cv_LV2_DEPS_LIBS=`$PKG_CONFIG --libs "lv2 >= 1.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -15240,9 +15240,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lv2core >= 1"`
++	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lv2 >= 1.0"`
+         else
+-	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lv2core >= 1"`
++	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lv2 >= 1.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LV2_DEPS_PKG_ERRORS" >&5
+--- calf.orig/configure.ac
++++ calf/configure.ac
+@@ -56,7 +56,7 @@ AC_SUBST(GUI_DEPS_LIBS)
+ AC_SUBST(JACK_DEPS_CFLAGS)
+ AC_SUBST(JACK_DEPS_LIBS)
+ 
+-PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 1, LV2_ENABLED="yes", LV2_ENABLED="no")
++PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.0, LV2_ENABLED="yes", LV2_ENABLED="no")
+ PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.5.2, LASH_ENABLED="yes", LASH_ENABLED="no")
+ 
+ if test "$LADSPA_FOUND" = "yes"; then
diff --git a/debian/patches/series b/debian/patches/series
index ba96d83..c7b31ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-libglade_to_gtkbuilder.patch
 1001_fix-ftbfs-with-gcc-4.7.patch
+1002-lv2core_to_lv2.patch
diff --git a/debian/rules b/debian/rules
index bc23b6d..f704f52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,4 +49,4 @@ clean::
 # Needed by upstream build process
 CDBS_BUILD_DEPENDS += , libglib2.0-dev, libgtk2.0-dev, libreadline-dev, libexpat1-dev
 CDBS_BUILD_DEPENDS += , libasound2-dev [linux-any]
-CDBS_BUILD_DEPENDS += , ladspa-sdk, dssi-dev, libjack-dev, lv2core
+CDBS_BUILD_DEPENDS += , ladspa-sdk, dssi-dev, libjack-dev, lv2-dev

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list