[packages] gstreamer: update to 0.10.29, rework Makefile:

 * rename gstreamer-libgst* to libgst*
 * rename gstreamer to libgstreamer
 * add a gstreamer meta-package
 * add gstreamer-utils
 * remove extra CFLAGS & LDFLAGS for libiconv & libintl (provided by glib2)

SVN-Revision: 22067

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index a18bade6f59ff963f91621b6a1b4779da567d14d..05f503c9462cdfdca3fe074e2334372d869e5708 100644 (file)
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,151 +8,187 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gstreamer
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gstreamer

-PKG_VERSION:=0.10.25
+PKG_VERSION:=0.10.29

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/

-PKG_MD5SUM:=88544e034a051baf472983791d233076
+PKG_MD5SUM:=c92d6bce4fc65fa9d5a3ad35cdd1a466
+

 PKG_FIXUP:=libtool
 PKG_FIXUP:=libtool

+PKG_INSTALL:=1

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-export PATH:=$(PKG_BUILD_DIR)/bin:$(TARGET_PATH)
-
-PKG_INSTALL=1
-
-EXTRA_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include
-
-EXTRA_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
-

 define Package/gstreamer/Default
 define Package/gstreamer/Default

-  DEPENDS:=+gstreamer
-  TITLE:=gstreamer
-  URL:=http://gstreamer.freedesktop.org/
-  SECTION:=multimedia

   CATEGORY:=Multimedia
   CATEGORY:=Multimedia

+  SECTION:=multimedia
+  TITLE:=GStreamer
+  URL:=http://gstreamer.freedesktop.org/
+endef
+
+define Package/gstreamer/description/Default
+ GStreamer open source multimedia framework

 endef
 
 endef
 

+

 define Package/gstreamer
 define Package/gstreamer

-  $(call Package/gstreamer/Default)
-  DEPENDS:=+libxml2 +glib2
+$(call Package/gstreamer/Default)
+  TITLE+= framework
+  DEPENDS+= +libgstreamer \
+       +libgstcheck \
+       +libgstcontroller \
+       +libgstdataprotocol \
+       +libgstnet

 endef
 endef

-  
+

 define Package/gstreamer/description
 define Package/gstreamer/description

-       A framework for streaming media.
+$(call Package/gstreamer/description/Default)
+ .
+ This meta package contains only dependencies on the other GStreamer
+ componenents.

 endef
 
 endef
 

-define Package/gstreamer-libgstcheck
-  $(call Package/gstreamer/Default)
-  TITLE+= (libgstcheck)
-endef
-  
-define Package/gstreamer-libgstcheck/description
-       gstreamer libgstcheck
+
+define Package/gstreamer-utils
+$(call Package/gstreamer/Default)
+  TITLE+= utilities
+  DEPENDS+= +libgstreamer

 endef
 
 endef
 

-define Package/gstreamer-libgstcontroller
-  $(call Package/gstreamer/Default)
-  TITLE+= (libgstcontroller)
+define Package/gstreamer-utils/description
+$(call Package/gstreamer/description/Default)
+ .
+ This package contains the GStreamer utilities.

 endef
 endef

-  
-define Package/gstreamer-libgstcontroller/description
-       gstreamer libgstcontroller
+
+
+define Package/libgstreamer
+$(call Package/gstreamer/Default)
+  TITLE+= library (core)
+  DEPENDS:= +glib2 +libpthread +libxml2

 endef
 
 endef
 

-define Package/gstreamer-libgstdataprotocol
-  $(call Package/gstreamer/Default)
-  TITLE+= (libgstdataprotocol)
+define Package/libgstreamer/description
+$(call Package/gstreamer/description/Default)
+ .
+ This package contains the GStreamer core library.

 endef
   
 endef
   

-define Package/gstreamer-libgstdataprotocol/description
-       gstreamer libgstdataprotocol
-endef

 
 

-define Package/gstreamer-libgstnet
-  $(call Package/gstreamer/Default)
-  TITLE+= (libgstnet)
+GST_VERSION:=0.10
+
+CONFIGURE_ARGS += \
+       --disable-debug \
+       --disable-examples \
+       --disable-tests \
+       --disable-valgrind \
+       \
+       --disable-gst-debug \
+       \
+       --without-libiconv-prefix \
+       --without-libintl-prefix \
+       --without-x \
+
+EXTRA_LDFLAGS+= \
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/include/gstreamer-$(GST_VERSION)/* \
+               $(1)/usr/include/gstreamer-$(GST_VERSION)/ \
+       )
+       $(INSTALL_DIR) $(1)/usr/lib
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/lib/libgst*-$(GST_VERSION).{a,la,so*} \
+               $(1)/usr/lib/ \
+       )
+       $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.{la,so} \
+               $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
+       )
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/lib/pkgconfig/gstreamer*-$(GST_VERSION).pc \
+               $(1)/usr/lib/pkgconfig/ \
+       )
+       $(INSTALL_DIR) $(2)/share/aclocal
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/share/aclocal/* \
+               $(2)/share/aclocal/ \
+       )

 endef
 
 endef
 

-define Package/gstreamer-libgstnet/description
-       gstreamer libgstnet
+define Package/gstreamer/install
+       /bin/true

 endef
 
 endef
 

-define Build/Configure
-       $(call Build/Configure/Default,\
-               --disable-gst-debug \
-               --disable-loadsave \
-               --disable-parse \
-               --disable-debug \
-               --disable-valgrind \
-               --disable-tests \
-               --disable-examples \
+define Package/gstreamer-utils/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/bin/gst-feedback* \
+               ./usr/bin/gst-launch* \
+               ./usr/bin/gst-inspect* \
+               ./usr/bin/gst-typefind* \
+               ./usr/bin/gst-xmlinspect* \
+               ./usr/bin/gst-xmllaunch* \
+               $(1)/usr/bin/ \

        )
        )

-       mkdir -p $(PKG_BUILD_DIR)/bin
-       touch $(PKG_BUILD_DIR)/bin/gtkdoc-rebase
-       chmod +x $(PKG_BUILD_DIR)/bin/gtkdoc-rebase

 endef
 
 endef
 

-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/include/* \
-               $(1)/usr/include/
-
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \
-               $(1)/usr/lib/
-
-       $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,la} \
-               $(1)/usr/lib/gstreamer-0.10
-
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-               $(1)/usr/lib/pkgconfig/
-
-       $(INSTALL_DIR) $(2)/share/aclocal/
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/share/aclocal/* \
-               $(2)/share/aclocal/
+define Package/libgstreamer/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/lib/libgstbase-$(GST_VERSION).so.* \
+               ./usr/lib/libgstreamer-$(GST_VERSION).so.* \
+               $(1)/usr/lib/ \
+       )
+       $(INSTALL_DIR) $(1)/usr/lib/gstreamer-$(GST_VERSION)
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/lib/gstreamer-$(GST_VERSION)/libgst*.so \
+               $(1)/usr/lib/gstreamer-$(GST_VERSION)/ \
+       )

 endef
 
 endef
 

-define Package/gstreamer/install
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libgstbase*.so* \
-               $(1)/usr/lib/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libgstreamer*.so* \
-               $(1)/usr/lib/
-
-       $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10/
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.so* \
-               $(1)/usr/lib/gstreamer-0.10
-endef

 
 

-define BuildLib
-  define Package/gstreamer-libgst$(1)/install
+# 1: short name
+# 2: description
+# 3: dependencies on other gstreamer libraries (short name)
+# 4: dependencies on other packages
+define GstBuildLibrary
+
+  define Package/libgst$(1)
+    $(call Package/gstreamer/Default)
+    TITLE+= $(2) library (core)
+    DEPENDS+= +libgstreamer $$(foreach p,$(3),+libgst$$(p)) $(4)
+  endef
+
+  define Package/libgst$(1)/description
+   $(call Package/gstreamer/description/Default)
+   .
+   This package contains the GStreamer $(2) library.
+  endef
+
+  define Package/libgst$(1)/install

        $(INSTALL_DIR) $$(1)/usr/lib
        $(INSTALL_DIR) $$(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgst$(1)*.so* \
-               $$(1)/usr/lib/
+       ( cd $(PKG_INSTALL_DIR); $(CP) \
+               ./usr/lib/libgst$(1)-$(GST_VERSION).so.* \
+               $$(1)/usr/lib/ \
+       )

   endef
 
   endef
 

-  $$(eval $$(call BuildPackage,gstreamer-libgst$(1)))
+  $$(eval $$(call BuildPackage,libgst$(1)))

 endef
 
 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))
 $(eval $(call BuildPackage,gstreamer))

-$(eval $(call BuildLib,check))
-$(eval $(call BuildLib,controller))
-$(eval $(call BuildLib,dataprotocol))
-$(eval $(call BuildLib,net))
+$(eval $(call BuildPackage,gstreamer-utils))
+$(eval $(call BuildPackage,libgstreamer))
+

diff --git a/multimedia/gstreamer/patches/001-no_docs.patch b/multimedia/gstreamer/patches/001-no_docs.patch
index 716e55fd40a01c31456a658b6efb2ead1ddaf937..e94fd0045ba58b5b23af2fd28505a485b774162d 100644 (file)
--- a/multimedia/gstreamer/patches/001-no_docs.patch
+++ b/multimedia/gstreamer/patches/001-no_docs.patch
@@ -1,37 +1,36 @@
-diff -u --recursive gstreamer-0.10.25-vanilla/Makefile.am gstreamer-0.10.25/Makefile.am
---- gstreamer-0.10.25-vanilla/Makefile.am      2009-11-14 23:04:56.812541974 -0500
-+++ gstreamer-0.10.25/Makefile.am      2009-11-14 23:05:22.744511310 -0500
-@@ -13,14 +13,12 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,7 +8,6 @@ aclocal_DATA = gst-element-check-@GST_MA

  
  SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \
  
  SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \

+       m4 \

        common
        common

- 
+@@ -16,7 +15,6 @@ SUBDIRS = pkgconfig \

  # These are all the possible subdirs
  DIST_SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \
  # These are all the possible subdirs
  DIST_SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \

+       m4 \

        common
        common

- 
-diff -u --recursive gstreamer-0.10.25-vanilla/Makefile.in gstreamer-0.10.25/Makefile.in
---- gstreamer-0.10.25-vanilla/Makefile.in      2009-11-14 23:04:56.775542524 -0500
-+++ gstreamer-0.10.25/Makefile.in      2009-11-14 23:05:28.561389821 -0500
-@@ -397,7 +397,6 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -445,7 +445,6 @@ aclocaldir = $(datadir)/aclocal

  aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
  SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \
  aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
  SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \

+       m4 \

        common
        common

- 
-@@ -405,7 +404,6 @@
+@@ -454,7 +453,6 @@ SUBDIRS = pkgconfig \

  # These are all the possible subdirs
  DIST_SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \
  # These are all the possible subdirs
  DIST_SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
 -      docs \
        po \

+       m4 \

        common
        common

- 

diff --git a/multimedia/gstreamer/patches/002-no-shave_mode.patch b/multimedia/gstreamer/patches/002-no-shave_mode.patch
deleted file mode 100644 (file)
index 1d1bded..0000000
--- a/multimedia/gstreamer/patches/002-no-shave_mode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -u --recursive gstreamer-0.10.25-vanilla/common/shave-libtool.in gstreamer-0.10.25/common/shave-libtool.in
---- gstreamer-0.10.25-vanilla/common/shave-libtool.in  2009-04-15 16:28:36.000000000 -0400
-+++ gstreamer-0.10.25/common/shave-libtool.in  2009-11-14 23:08:34.744433657 -0500
-@@ -41,12 +41,9 @@
- 
- case "$mode" in
- compile)
--    # shave will be called and print the actual CC/CXX/LINK line
--    preserved_args="$preserved_args --shave-mode=$mode"
-     pass_though=1
-     ;;
- link)
--    preserved_args="$preserved_args --shave-mode=$mode"
-     Q="  LINK  "
-     ;;
- *)

diff --git a/multimedia/gstreamer/patches/002-no_tests.patch b/multimedia/gstreamer/patches/002-no_tests.patch
new file mode 100644 (file)
index 0000000..6058a38
--- /dev/null
+++ b/multimedia/gstreamer/patches/002-no_tests.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,14 +7,14 @@ aclocaldir = $(datadir)/aclocal
+ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
+ 
+ SUBDIRS = pkgconfig \
+-      gst libs plugins tools tests \
++      gst libs plugins tools \
+       po \
+       m4 \
+       common
+ 
+ # These are all the possible subdirs
+ DIST_SUBDIRS = pkgconfig \
+-      gst libs plugins tools tests \
++      gst libs plugins tools \
+       po \
+       m4 \
+       common
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -444,7 +444,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk
+ aclocaldir = $(datadir)/aclocal
+ aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
+ SUBDIRS = pkgconfig \
+-      gst libs plugins tools tests \
++      gst libs plugins tools \
+       po \
+       m4 \
+       common
+@@ -452,7 +452,7 @@ SUBDIRS = pkgconfig \
+ 
+ # These are all the possible subdirs
+ DIST_SUBDIRS = pkgconfig \
+-      gst libs plugins tools tests \
++      gst libs plugins tools \
+       po \
+       m4 \
+       common