summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2008-08-19 23:00:38 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2008-08-19 23:00:38 +0000
commitec81022748a817236c409744a092d06bb7d6605f (patch)
tree6a42726915f546edbabf5b541d1e9f5379de6171 /packages
parentdd3a870ed4f6deed3141c596e2b5520eb9f8fba8 (diff)
gst-ffmpeg: fix building with libtool2 and above
* gst-lib/ext/configure.ac needed only AC_PROG_CXX entry * fixes bug 4427 * bump PR
Diffstat (limited to 'packages')
-rw-r--r--packages/gstreamer/gst-ffmpeg/autotools.patch21
-rw-r--r--packages/gstreamer/gst-ffmpeg_0.10.2.bb6
2 files changed, 25 insertions, 2 deletions
diff --git a/packages/gstreamer/gst-ffmpeg/autotools.patch b/packages/gstreamer/gst-ffmpeg/autotools.patch
new file mode 100644
index 0000000000..76e7ac6486
--- /dev/null
+++ b/packages/gstreamer/gst-ffmpeg/autotools.patch
@@ -0,0 +1,21 @@
+Index: gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac
+===================================================================
+--- gst-ffmpeg-0.10.2.orig/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:20:19.177850039 +0200
++++ gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:26:24.567809464 +0200
+@@ -27,13 +27,15 @@
+
+ AM_MAINTAINER_MODE
+ AC_GNU_SOURCE
++
++AC_PROG_LIBTOOL
+ AM_PROG_AS
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+ AC_STDC_HEADERS
+ AM_DISABLE_STATIC
+-AC_PROG_LIBTOOL
+
+ dnl Warning for anyone using these custom macros.
+ dnl before asking me questions on why it doesn't work and why you
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
index e4dfb0b701..2cad978a16 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -4,12 +4,14 @@ PRIORITY = "optional"
LICENSE = "LGPL"
HOMEPAGE = "http://www.gstreamer.net/"
DEPENDS = "gstreamer zlib"
-PR = "r1"
+PR = "r2"
inherit autotools pkgconfig
SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
- file://armv5.patch;patch=1"
+ file://armv5.patch;patch=1 \
+ file://autotools.patch;patch=1 \
+ "
FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"