Update gstreamer to version 1.2.2. gstreamer 0.10.36 doesn't support bison 3+(from r38169), this patch can solve the compile error. gstreamer starts supporting bison 3+ from 1.1.4.
http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.2.2.tar.xz needs to be added to http://downloads.openwrt.org/sources/ Signed-off-by: JiapengLi <[email protected]> --- diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index a5e896f..dda4f24 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer -PKG_VERSION:=0.10.36 +PKG_VERSION:=1.2.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ -PKG_MD5SUM:=a0cf7d6877f694a1a2ad2b4d1ecb890b +PKG_MD5SUM:=4293ca4d8333690d5acdffe3ad354924 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh aclocal.m4 @@ -79,7 +79,7 @@ $(call Package/gstreamer/description/Default) endef -GST_VERSION:=0.10 +GST_VERSION:=1.0 CONFIGURE_ARGS += \ --disable-examples \ @@ -101,7 +101,7 @@ define Build/InstallDev ) $(INSTALL_DIR) $(1)/usr/lib ( cd $(PKG_INSTALL_DIR); $(CP) \ - ./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \ + ./usr/lib/libgst*-$(GST_VERSION).{la,so*} \ $(1)/usr/lib/ \ ) $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION) @@ -184,7 +184,6 @@ endef $(eval $(call GstBuildLibrary,check,check unit testing)) $(eval $(call GstBuildLibrary,controller,dynamic parameter control)) -$(eval $(call GstBuildLibrary,dataprotocol,data protocol)) $(eval $(call GstBuildLibrary,net,network classes)) $(eval $(call BuildPackage,gstreamer)) diff --git a/multimedia/gstreamer/patches/001-no_docs.patch b/multimedia/gstreamer/patches/001-no_docs.patch index e94fd00..a4bb6b8 100644 --- a/multimedia/gstreamer/patches/001-no_docs.patch +++ b/multimedia/gstreamer/patches/001-no_docs.patch @@ -1,14 +1,14 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_MA +@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP SUBDIRS = pkgconfig \ - gst libs plugins tools tests \ + gst libs plugins tests \ - docs \ po \ m4 \ common -@@ -16,7 +15,6 @@ SUBDIRS = pkgconfig \ +@@ -20,7 +19,6 @@ endif # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ gst libs plugins tools tests \ @@ -18,15 +18,14 @@ common --- a/Makefile.in +++ b/Makefile.in -@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@[email protected] - SUBDIRS = pkgconfig \ - gst libs plugins tools tests \ -- docs \ - po \ - m4 \ - common -@@ -454,7 +453,6 @@ SUBDIRS = pkgconfig \ +@@ -555,13 +555,12 @@ top_srcdir = @top_srcdir@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook + aclocaldir = $(datadir)/aclocal + aclocal_DATA = gst-element-check-@[email protected] +-SUBDIRS = pkgconfig gst libs plugins tests docs po m4 common \ ++SUBDIRS = pkgconfig gst libs plugins tests po m4 common \ + $(am__append_1) + # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ gst libs plugins tools tests \ diff --git a/multimedia/gstreamer/patches/002-no_tests.patch b/multimedia/gstreamer/patches/002-no_tests.patch index 6058a38..4fef94f 100644 --- a/multimedia/gstreamer/patches/002-no_tests.patch +++ b/multimedia/gstreamer/patches/002-no_tests.patch @@ -1,14 +1,15 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -7,14 +7,14 @@ aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@[email protected] +@@ -7,7 +7,7 @@ aclocaldir = $(datadir)/aclocal + aclocal_DATA = gst-element-check-@[email protected] SUBDIRS = pkgconfig \ -- gst libs plugins tools tests \ -+ gst libs plugins tools \ +- gst libs plugins tests \ ++ gst libs plugins \ po \ m4 \ common +@@ -18,7 +18,7 @@ endif # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ @@ -19,16 +20,13 @@ common --- a/Makefile.in +++ b/Makefile.in -@@ -444,7 +444,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk +@@ -555,12 +555,12 @@ top_srcdir = @top_srcdir@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@[email protected] - SUBDIRS = pkgconfig \ -- gst libs plugins tools tests \ -+ gst libs plugins tools \ - po \ - m4 \ - common -@@ -452,7 +452,7 @@ SUBDIRS = pkgconfig \ + aclocal_DATA = gst-element-check-@[email protected] +-SUBDIRS = pkgconfig gst libs plugins tests po m4 common \ ++SUBDIRS = pkgconfig gst libs plugins po m4 common \ + $(am__append_1) # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ diff --git a/multimedia/gstreamer/patches/003-no_translations.patch b/multimedia/gstreamer/patches/003-no_translations.patch index 8090563..7fdfc4e 100644 --- a/multimedia/gstreamer/patches/003-no_translations.patch +++ b/multimedia/gstreamer/patches/003-no_translations.patch @@ -1,23 +1,14 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -695,7 +695,6 @@ libs/gst/net/Makefile - plugins/Makefile - plugins/indexers/Makefile - plugins/elements/Makefile --po/Makefile.in - tests/Makefile - tests/benchmarks/Makefile - tests/check/Makefile --- a/Makefile.am +++ b/Makefile.am -@@ -8,14 +8,12 @@ aclocal_DATA = gst-element-check-@GST_MA +@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_AP SUBDIRS = pkgconfig \ - gst libs plugins tools \ + gst libs plugins \ - po \ m4 \ common +@@ -19,7 +18,6 @@ endif # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ gst libs plugins tools \ @@ -27,15 +18,14 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal - aclocal_DATA = gst-element-check-@[email protected] - SUBDIRS = pkgconfig \ - gst libs plugins tools \ -- po \ - m4 \ - common +@@ -555,13 +555,12 @@ top_srcdir = @top_srcdir@ + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-docbook + aclocaldir = $(datadir)/aclocal + aclocal_DATA = gst-element-check-@[email protected] +-SUBDIRS = pkgconfig gst libs plugins po m4 common \ ++SUBDIRS = pkgconfig gst libs plugins m4 common \ + $(am__append_1) -@@ -453,7 +452,6 @@ SUBDIRS = pkgconfig \ # These are all the possible subdirs DIST_SUBDIRS = pkgconfig \ gst libs plugins tools \ -- JiapengLi Blog:jiapeng.me GitHub: github.com/jiapengli AboutMe: about.me/lich _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
