From 26ef97123cca2441eb7f483a746b5ada226ac630 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 5 Aug 2014 16:13:49 -0400 Subject: [PATCH] gstreamer1 build work in progress --- libs/liboil/Makefile | 12 +++-- libs/libsoup/Makefile | 75 +++++++++++++++++++++++++++ multimedia/gst1-plugins-bad/Makefile | 47 ++++++++++------- multimedia/gst1-plugins-base/Makefile | 9 ++-- multimedia/gst1-plugins-good/Makefile | 14 +++-- multimedia/gst1-plugins-ugly/Makefile | 6 ++- multimedia/gstreamer1/Makefile | 7 ++- 7 files changed, 134 insertions(+), 36 deletions(-) create mode 100644 libs/libsoup/Makefile diff --git a/libs/liboil/Makefile b/libs/liboil/Makefile index d444f69d4..ce844e2d6 100644 --- a/libs/liboil/Makefile +++ b/libs/liboil/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,16 +9,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liboil PKG_VERSION:=0.3.17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/ PKG_MD5SUM:=47dc734f82faeb2964d97771cfd2e701 +PKG_LICENSE:=FREE +PKG_LICENSE_FILE:=COPYING + PKG_FIXUP:=autoreconf PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/liboil SECTION:=libs @@ -26,7 +30,7 @@ define Package/liboil TITLE:=simple functions optimized for various CPUs URL:=http://liboil.freedesktop.org/wiki/ MAINTAINER:=W. Michael Petullo - DEPENDS:=+librt + DEPENDS:=+librt $(ICONV_DEPENDS) $(INTL_DEPENDS) endef define Package/liboil/description @@ -42,7 +46,7 @@ CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) $(if $(ICONV_FULL),-liconv) $(if $(INTL_FULL),-lintl) # XXX: VFP_CFLAGS is set to '-mfpu=vfp' on arm by configure, but that breaks # final linking stages, so override it until we find why diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile new file mode 100644 index 000000000..feb6264c0 --- /dev/null +++ b/libs/libsoup/Makefile @@ -0,0 +1,75 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libsoup +PKG_VERSION:=2.38.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.38 +PKG_MD5SUM:=d13fb4968acea24c26b83268a308f580 + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILE:=COPYING + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib $(if $(ICONV_FULL),-liconv) + +define Package/libsoup + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libsoup + URL:=http://live.gnome.org/LibSoup + MAINTAINER:=W. Michael Petullo + DEPENDS:=+glib2 +libxml2 +libgnutls $(ICONV_DEPENDS) $(INTL_DEPENDS) +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-ssl \ + --disable-glibtest \ + --without-apache-httpd \ + --without-gnome \ + ) +endef + +define package/libsoup/decription +Libsoup is an HTTP library implementation in C +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup} + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.{so*,la,a} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/libsoup-2.4/libsoup/*.h \ + $(1)/usr/include/libsoup-2.4/libsoup/ +endef + +define Package/libsoup/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libsoup)) diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index 8e0c4ba1d..5ffe4ed8c 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2011 OpenWrt.org +# Copyright (C) 2011-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,8 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad PKG_VERSION:=1.2.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 + PKG_MAINTAINER:=W. Michael Petullo + PKG_LICENSE:=LGPLv2 GPLv2 PKG_LICENSE_FILE:=COPYING.LIB COPYING @@ -32,6 +34,7 @@ define Package/gstreamer1/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= $(ICONV_DEPENDS) endef define Package/gstreamer1/description/Default @@ -126,8 +129,11 @@ CONFIGURE_ARGS += \ --without-libintl-prefix \ --without-x \ +TARGET_CFLAGS+= -std=gnu99 + EXTRA_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + $(if $(ICONV_FULL),-liconv) \ define Package/gst1-plugins-ugly/install @@ -164,8 +170,9 @@ define GstBuildLibrary $$(eval $$(call BuildPackage,libgst1$(1))) endef -$(eval $(call GstBuildLibrary,photography,photography,,)) +$(eval $(call GstBuildLibrary,photography,photography,,)) +$(eval $(call GstBuildLibrary,basecamerabinsrc,basecamerabinsrc,app,)) # 1: short name # 2: description @@ -199,26 +206,26 @@ define GstBuildPlugin $$(eval $$(call BuildPackage,gst1-mod-$(1))) endef -$(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,,,)) -$(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,,,)) -$(eval $(call GstBuildPlugin,aiff,aiff support,,,)) +$(eval $(call GstBuildPlugin,adpcmdec,adpcm decoding support,audio,,)) +$(eval $(call GstBuildPlugin,adpcmenc,adpcm encoding support,audio,,)) +$(eval $(call GstBuildPlugin,aiff,aiff support,audio tag,,)) $(eval $(call GstBuildPlugin,asfmux,asf muxing support,rtp,,)) -$(eval $(call GstBuildPlugin,audioparsersbad,audioparsers support,audio tag,,)) +#$(eval $(call GstBuildPlugin,audioparsersbad,audioparsers support,audio tag,,)) $(eval $(call GstBuildPlugin,autoconvert,autoconvert support,,,)) -$(eval $(call GstBuildPlugin,camerabin,camerabin support,photography,,)) -$(eval $(call GstBuildPlugin,legacyresample,legacyresample support,,,+liboil +librt)) +$(eval $(call GstBuildPlugin,camerabin2,camerabin support,basecamerabinsrc photography tag pbutils app,,)) +#$(eval $(call GstBuildPlugin,legacyresample,legacyresample support,,,+liboil +librt)) $(eval $(call GstBuildPlugin,bayer,bayer support,video,,)) -$(eval $(call GstBuildPlugin,cdxaparse,cdxaparse support,riff,,)) +#$(eval $(call GstBuildPlugin,cdxaparse,cdxaparse support,riff,,)) $(eval $(call GstBuildPlugin,dataurisrc,dataurisrc support,,,)) -$(eval $(call GstBuildPlugin,dccp,dccp support,,,)) -$(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,,,)) -$(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,)) +#$(eval $(call GstBuildPlugin,dccp,dccp support,,,)) +$(eval $(call GstBuildPlugin,debugutilsbad,debugutils support,video,,)) +#$(eval $(call GstBuildPlugin,dtmf,dtmf support,rtp,,)) $(eval $(call GstBuildPlugin,dvdspu,dvdspu support,video,,)) $(eval $(call GstBuildPlugin,festival,festival support,audio,,)) $(eval $(call GstBuildPlugin,freeze,freeze support,,,)) $(eval $(call GstBuildPlugin,frei0r,frei0r support,controller video,,)) $(eval $(call GstBuildPlugin,h264parse,h264parse support,,,)) -$(eval $(call GstBuildPlugin,hdvparse,hdvparse support,,,)) +#$(eval $(call GstBuildPlugin,hdvparse,hdvparse support,,,)) $(eval $(call GstBuildPlugin,id3tag,id3tag support,tag,,)) $(eval $(call GstBuildPlugin,invtelecine,invtelecine support,,,)) $(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag,,)) @@ -229,10 +236,10 @@ $(eval $(call GstBuildPlugin,mpegtsmux,mpegtsmux support,,,)) $(eval $(call GstBuildPlugin,mpegpsmux,mpegpsmux support,,,)) $(eval $(call GstBuildPlugin,mpeg4videoparse,mpeg4videoparse support,,,)) $(eval $(call GstBuildPlugin,mpegvideoparse,mpegvideoparse support,,,)) -$(eval $(call GstBuildPlugin,mve,mve support,,,)) +#$(eval $(call GstBuildPlugin,mve,mve support,,,)) $(eval $(call GstBuildPlugin,mxf,mxf support,video,,)) $(eval $(call GstBuildPlugin,nsf,nsf support,,,)) -$(eval $(call GstBuildPlugin,nuvdemux,nuvdemux support,,,)) +#$(eval $(call GstBuildPlugin,nuvdemux,nuvdemux support,,,)) $(eval $(call GstBuildPlugin,pcapparse,pcapparse support,,,)) $(eval $(call GstBuildPlugin,pnm,pnm support,video,,)) $(eval $(call GstBuildPlugin,qtmux,qtmux support,tag,,)) @@ -247,10 +254,10 @@ $(eval $(call GstBuildPlugin,siren,siren support,rtp,,)) $(eval $(call GstBuildPlugin,speed,speed support,,,)) $(eval $(call GstBuildPlugin,subenc,subenc support,controller,,)) $(eval $(call GstBuildPlugin,stereo,stereo support,audio controller,,)) -$(eval $(call GstBuildPlugin,tta,tta support,,,)) +#$(eval $(call GstBuildPlugin,tta,tta support,,,)) $(eval $(call GstBuildPlugin,valve,valve support,,,)) -$(eval $(call GstBuildPlugin,videomeasure,videomeasure support,video,,)) -$(eval $(call GstBuildPlugin,videosignal,videosignal support,video,,)) -$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,)) +#$(eval $(call GstBuildPlugin,videomeasure,videomeasure support,video,,)) +#$(eval $(call GstBuildPlugin,videosignal,videosignal support,video,,)) +#$(eval $(call GstBuildPlugin,vmnc,vmnc support,,,)) $(eval $(call BuildPackage,gst1-plugins-bad)) diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index 2b51b106c..2ec63c9b7 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-base PKG_VERSION:=1.2.3 PKG_RELEASE:=1 + PKG_MAINTAINER:=W. Michael Petullo + PKG_LICENSE:=LGPLv2 GPLv2 PKG_LICENSE_FILE:=COPYING.LIB COPYING @@ -41,14 +43,12 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk -# -liconv crept in from pkg-config, to be revisited later -include $(INCLUDE_DIR)/nls.mk - define Package/gstreamer1/Default CATEGORY:=Multimedia SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= $(ICONV_DEPENDS) endef define Package/gstreamer1/description/Default @@ -116,6 +116,7 @@ CONFIGURE_ARGS += \ EXTRA_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + $(if $(ICONV_FULL),-liconv) \ define Build/InstallDev diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index f9b78e889..8d5e5b607 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -1,4 +1,4 @@ -## Copyright (C) 2009-2011 OpenWrt.org +## Copyright (C) 2009-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,16 +7,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-good -PKG_VERSION:=1.0.7 +PKG_VERSION:=1.2.3 PKG_RELEASE:=1 + PKG_MAINTAINER:=W. Michael Petullo + PKG_LICENSE:=LGPLv2 PKG_LICENSE_FILE:=COPYING PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/ -PKG_MD5SUM:=e4b1c825475a9b478fe29e8e9f34516f +PKG_MD5SUM:=1a1f96bc27ad446e559474299160a9a8 PKG_BUILD_DEPENDS:= gstreamer1 gst1-plugins-base liboil @@ -31,6 +33,7 @@ define Package/gstreamer1/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= $(ICONV_DEPENDS) endef define Package/gstreamer1/description/Default @@ -113,6 +116,7 @@ CONFIGURE_ARGS += \ EXTRA_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + $(if $(ICONV_FULL),-liconv) \ define Package/gst1-plugins-good/install @@ -162,13 +166,13 @@ $(eval $(call GstBuildPlugin,id3demux,ID3v1/v2 demuxer,pbutils tag,,)) $(eval $(call GstBuildPlugin,icydemux,icy demuxer,audio tag,,)) $(eval $(call GstBuildPlugin,interleave,audio interleave,audio,,)) $(eval $(call GstBuildPlugin,level,audio level,audio,,)) -$(eval $(call GstBuildPlugin,audioparsers,audioparsers,audio tag,,)) +$(eval $(call GstBuildPlugin,audioparsers,audioparsers,audio tag pbutils,,)) $(eval $(call GstBuildPlugin,multifile,multiple files access,video,,)) $(eval $(call GstBuildPlugin,multipart,multipart stream handling,,,)) $(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio,,)) $(eval $(call GstBuildPlugin,replaygain,volume normalization,pbutils,,)) $(eval $(call GstBuildPlugin,rtp,RTP,audio rtp tag pbutils video,,)) -$(eval $(call GstBuildPlugin,rtsp,RTSP,rtp rtsp sdp,,)) +$(eval $(call GstBuildPlugin,rtsp,RTSP,net rtp rtsp sdp,,)) $(eval $(call GstBuildPlugin,souphttpsrc,soup input,audio tag,,+libsoup)) $(eval $(call GstBuildPlugin,spectrum,spectrum data output,audio fft,,)) $(eval $(call GstBuildPlugin,udp,UDP,net,,)) diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index 837ffa1f4..27929d026 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly PKG_VERSION:=1.2.3 PKG_RELEASE:=1 + PKG_MAINTAINER:=W. Michael Petullo + PKG_LICENSE:=LGPLv2 PKG_LICENSE_FILE:=COPYING @@ -37,6 +39,7 @@ define Package/gstreamer1/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= $(ICONV_DEPENDS) endef define Package/gstreamer1/description/Default @@ -91,6 +94,7 @@ CONFIGURE_ARGS += \ EXTRA_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + $(if $(ICONV_FULL),-liconv) \ define Package/gst1-plugins-ugly/install diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 5c54b1044..6a46014ea 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2012 OpenWrt.org +# Copyright (C) 2008-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 PKG_VERSION:=1.2.3 PKG_RELEASE:=1 + PKG_MAINTAINER:=W. Michael Petullo + PKG_LICENSE:=LGPLv2 PKG_LICENSE_FILE:=COPYING @@ -32,6 +34,7 @@ define Package/gstreamer1/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= $(ICONV_DEPENDS) $(INTL_DEPENDS) endef define Package/gstreamer1/description/Default @@ -95,7 +98,7 @@ CONFIGURE_ARGS += \ EXTRA_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -L$(ICONV_PREFIX)/lib -L$(INTL_PREFIX)/lib + $(if $(ICONV_FULL),-liconv) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)