[SCM] lives packaging branch, master, updated. debian/1.3.2-1-2-g758d0a8

hrickards-guest at users.alioth.debian.org hrickards-guest at users.alioth.debian.org
Wed Apr 7 21:06:30 UTC 2010


The following commit has been merged in the master branch:
commit 758d0a879831d9cae68dfc85df34b8b98e9142d1
Author: Harry RIckards <hrickards at lucid.(none)>
Date:   Wed Apr 7 19:22:17 2010 +0100

    Added patch from upstream that fixes the mipsel build

diff --git a/debian/patches/makefile_am.diff b/debian/patches/makefile_am.diff
new file mode 100644
index 0000000..3ee43fa
--- /dev/null
+++ b/debian/patches/makefile_am.diff
@@ -0,0 +1,26 @@
+Index: lives/lives-plugins/weed-plugins/Makefile.am
+===================================================================
+--- lives.orig/lives-plugins/weed-plugins/Makefile.am	2010-04-07 19:18:21.089776986 +0100
++++ lives/lives-plugins/weed-plugins/Makefile.am	2010-04-07 19:18:55.469775344 +0100
+@@ -16,7 +16,7 @@
+ shared_cflags = -fPIC -DPIC
+ endif
+ 
+-AM_LDFLAGS = $(shared_ldflags) -O3 -L/usr/lib64 ../../libweed/libweed-utils.la ../../libweed/libweed-plugin-utils.la
++AM_LDFLAGS = $(shared_ldflags) -O3 ../../libweed/libweed-utils.la ../../libweed/libweed-plugin-utils.la
+ AM_CFLAGS = $(shared_cflags) -O3 -ffast-math
+ AM_CPPFLAGS = $(shared_cflags) -O3 -ffast-math
+ 
+Index: lives/lives-plugins/weed-plugins/gdk/Makefile.am
+===================================================================
+--- lives.orig/lives-plugins/weed-plugins/gdk/Makefile.am	2010-04-07 19:19:04.749776431 +0100
++++ lives/lives-plugins/weed-plugins/gdk/Makefile.am	2010-04-07 19:19:19.333775305 +0100
+@@ -12,7 +12,7 @@
+ shared_cflags = -fPIC -DPIC
+ endif
+ 
+-AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -O3 -L/usr/lib64  ../../../libweed/libweed-utils.la ../../../libweed/libweed-plugin-utils.la
++AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -O3  ../../../libweed/libweed-utils.la ../../../libweed/libweed-plugin-utils.la
+ AM_CFLAGS = $(shared_cflags) -I$(srcdir)/.. @GTK_CFLAGS@ -O3 -ffast-math
+ 
+ if ENABLE_VJACK
diff --git a/debian/patches/series b/debian/patches/series
index ada5900..4d3cf38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 cdda2wav_to_icedax.diff
 removepy.diff
+makefile_am.diff

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list