Skip to contentSkip to conversation

patches for gstreamer packages (update)

Buildroot New Sven Neumann 3 participants 17 messages Jul 7, 2011

lore
Share & tools
lore

Sven Neumann

author
#0 lore raw

Hi,

I am resending the patchset for the gstreamer packages with the suggested changes/fixes. I've also continued working on the configurations and as far as I can tell all dependency-less plugins are now configurable. Also all obsoleted configuration options are removed.

Please consider to include these changes.

Thanks,
Sven

author
#1 lore raw

PATCH 1/9 gst-plugins-base: add option for dependency-less plugin

Make the build of the dependency-less plugin 'encoding' optional.

Signed-off-by Sven Neumann <[email protected]>
---
 package/multimedia/gst-plugins-base/Config.in      |    3 +++
 .../gst-plugins-base/gst-plugins-base.mk           |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)
package/multimedia/gst-plugins-base/Config.in +3 -0
index 09c243c..3ac4dac 100644
@@ -30,6 +30,9 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC
 	bool "audiotestsrc"
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING
+	bool "encoding"
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE
 	bool "ffmpegcolorspace (mandatory for video playback)"
 	default y
package/multimedia/gst-plugins-base/gst-plugins-base.mk +6 -0
index 1d0b19d..7218873 100644
@@ -69,6 +69,12 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-encoding
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-encoding
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-ffmpegcolorspace
 else
Signature · 1 line
1.7.1
#2 lore raw

PATCH 1/9 gst-plugins-base: add option for dependency-less plugin

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> Make the build of the dependency-less plugin 'encoding' optional.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 2/9 gst-plugins: ivborbis (aka tremor) moved to gst-plugins-base

In reply to Sven Neumann

The integer vorbis decoder moved from gst-plugins-bad to gst-plugins-base.

---
 package/multimedia/gst-plugins-bad/Config.in       |    4 ----
 .../multimedia/gst-plugins-bad/gst-plugins-bad.mk  |    7 -------
 package/multimedia/gst-plugins-base/Config.in      |    4 ++++
 .../gst-plugins-base/gst-plugins-base.mk           |    7 +++++++
 4 files changed, 11 insertions(+), 11 deletions(-)
package/multimedia/gst-plugins-bad/Config.in +0 -4
index e25b756..23d5916 100644
@@ -192,10 +192,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
 	select BR2_PACKAGE_SDL
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR
-	bool "tremor"
-	select BR2_PACKAGE_TREMOR
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
 	bool "vcd"
package/multimedia/gst-plugins-bad/gst-plugins-bad.mk +0 -7
index 31d998f..5bbb53a 100644
@@ -355,13 +355,6 @@ else
 GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-ivorbis
-GST_PLUGINS_BAD_DEPENDENCIES += tremor
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-ivorbis
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
 GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
 else
package/multimedia/gst-plugins-base/Config.in +4 -0
index 3ac4dac..851337b 100644
@@ -86,6 +86,10 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
 	bool "theora (*.ogg video)"
 	select BR2_PACKAGE_LIBTHEORA
 
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR
+	bool "tremor"
+	select BR2_PACKAGE_TREMOR
+
 config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS
 	bool "vorbis (*.ogg audio)"
 	select BR2_PACKAGE_LIBVORBIS
package/multimedia/gst-plugins-base/gst-plugins-base.mk +7 -0
index 7218873..79ced30 100644
@@ -156,6 +156,13 @@ else
 GST_PLUGINS_BASE_CONF_OPT += --disable-theora
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST_PLUGINS_BASE_DEPENDENCIES += tremor
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-vorbis
 GST_PLUGINS_BASE_DEPENDENCIES += libvorbis
Signature · 1 line
1.7.1
#4 lore raw

PATCH 2/9 gst-plugins: ivborbis (aka tremor) moved to gst-plugins-base

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> The integer vorbis decoder moved from gst-plugins-bad to Sven> gst-plugins-base.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 3/9 gst-plugins-bad: clean up configuration

In reply to Sven Neumann

Remove obsoleted configurations and add options for new dependency-less plugins.

Signed-off-by Sven Neumann <[email protected]>
---
 package/multimedia/gst-plugins-bad/Config.in       |   87 +++++++----
 .../multimedia/gst-plugins-bad/gst-plugins-bad.mk  |  161 +++++++++++++++-----
 2 files changed, 180 insertions(+), 68 deletions(-)
package/multimedia/gst-plugins-bad/Config.in +59 -28
index 23d5916..5ccaa16 100644
@@ -12,14 +12,14 @@ if BR2_PACKAGE_GST_PLUGINS_BAD
 
 comment "dependency-less plugins"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AACPARSE
-	bool "aacparse"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC
+	bool "adpcmdec"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFFPARSE
-	bool "aiffparse"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC
+	bool "adpcmenc"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AMRPARSE
-	bool "amrparse"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF
+	bool "aiff"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX
 	bool "asfmux"

@@ -28,12 +28,21 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
 	bool "apexsink"
 	select BR2_PACKAGE_OPENSSL
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOPARSERS
+	bool "audioparsers"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT
 	bool "autoconvert"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN
 	bool "camerabin"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS
+	bool "coloreffects"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE
+	bool "colorspace"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE
 	bool "legacyresample"
 

@@ -47,6 +56,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE
 	bool "cdxaparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC
+	bool "dataurisrc"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP
 	bool "dccp"
 

@@ -56,13 +68,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
 	bool "dtmf"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDNAV
-	bool "dvdnav"
-	depends on BR2_LARGEFILE # libdvdread
-	select BR2_PACKAGE_LIBDVDNAV
-
-comment "dvdnav requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
+	bool "dvdsuboverlay"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU
 	bool "dvdspu"

@@ -76,12 +83,36 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R
 	bool "frei0r"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS
+	bool "gaudieffects"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM
+	bool "geometrictransform"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS
+	bool "gsettings"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE
 	bool "h264parse"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE
 	bool "hdvparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE
+	bool "interlace"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INVTELECINE
+	bool "invtelecine"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE
+	bool "ivfparse"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR
+	bool "jp2kdecimator"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT
+	bool "jpegformat"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB
 	bool "librfb"
 

@@ -91,6 +122,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX
 	bool "mpegdemux"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX
+	bool "mpegpsmux"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX
 	bool "mpegtsmux"
 

@@ -115,6 +149,9 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE
 	bool "pcapparse"
 
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM
+	bool "pnm"
+
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_QTMUX
 	bool "qtmux"
 

@@ -124,9 +161,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL
 	bool "real"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMANAGER
-	bool "rtpmanager"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX
 	bool "rtpmux"
 

@@ -136,11 +170,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP
 	bool "sdp"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SELECTOR
-	bool "selector"
-
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SHAPEWIPE
-	bool "shapewipe"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP
+	bool "segmentclip"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN
 	bool "siren"

@@ -157,8 +188,11 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA
 	bool "tta"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VALVE
-	bool "valve"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE
+	bool "videomaxrate"
+
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
+	bool "videomeasure"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
 	bool "videosignal"

@@ -166,8 +200,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC
 	bool "vmnc"
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_XDGMIME
-	bool "xdgmime"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
+	bool "y4m"
 
 comment "plugins with external dependencies (there may be more available)"
 

@@ -185,9 +219,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON
 	bool "neon"
 	select BR2_PACKAGE_NEON
 
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OSS4
-	bool "oss4"
-
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
 	bool "sdl"
 	select BR2_PACKAGE_SDL
package/multimedia/gst-plugins-bad/gst-plugins-bad.mk +121 -40

256 lines not on this page · raw message

Signature · 1 line
1.7.1
#6 lore raw

PATCH 3/9 gst-plugins-bad: clean up configuration

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> Remove obsoleted configurations and add options for new Sven> dependency-less plugins.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 4/9 orc: new package

In reply to Sven Neumann

Orc - the Oil Runtime Compiler - is the successor of liboil.

Signed-off-by Sven Neumann <[email protected]>
---
 package/Config.in     |    1 +
 package/orc/Config.in |    7 +++++++
 package/orc/orc.mk    |   12 ++++++++++++
 3 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 package/orc/Config.in
 create mode 100644 package/orc/orc.mk
package/Config.in +1 -0
index b06c669..ef800b9 100644
@@ -340,6 +340,7 @@ source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
 source "package/liboil/Config.in"
 source "package/libsigc/Config.in"
+source "package/orc/Config.in"
 source "package/startup-notification/Config.in"
 endmenu
package/orc/Config.in new file +7 -0
new file mode 100644
index 0000000..3b3e059
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ORC
+	bool "orc"
+	help
+	  Orc is a library and set of tools for compiling and executing
+          very simple programs that operate on arrays of data.
+
+          http://code.entropywave.com/projects/orc/
package/orc/orc.mk new file +12 -0
new file mode 100644
index 0000000..c1b4baa
@@ -0,0 +1,12 @@
+#############################################################
+#
+# orc
+#
+#############################################################
+ORC_VERSION = 0.4.14
+ORC_SOURCE = orc-$(ORC_VERSION).tar.gz
+ORC_SITE = http://code.entropywave.com/download/orc/
+ORC_AUTORECONF = YES
+ORC_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,orc))
Signature · 1 line
1.7.1
author
#8 lore raw

PATCH 5/9 gst-plugins-base: depend on orc if it is enabled

In reply to Sven Neumann
Signed-off-by Sven Neumann <[email protected]>
---
 .../gst-plugins-base/gst-plugins-base.mk           |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/multimedia/gst-plugins-base/gst-plugins-base.mk +4 -0
index 79ced30..09e0729 100644
@@ -26,6 +26,10 @@ GST_PLUGINS_BASE_CONF_OPT = \
 
 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer
 
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST_PLUGINS_BASE_DEPENDENCIES += orc
+endif
+
 # alsa support needs pcm+mixer support, but configure fails to check for it
 ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
 GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib
Signature · 1 line
1.7.1
author
#9 lore raw

PATCH 6/9 gst-ffmpeg: depend on orc if it is enabled

In reply to Sven Neumann
Signed-off-by Sven Neumann <[email protected]>
---
 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk |   36 +++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 2 deletions(-)
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk +34 -2
index ebe87dc..4e7ca66 100644
@@ -8,8 +8,40 @@ GST_FFMPEG_VERSION = 0.10.11
 GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
 GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
 GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
-GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
+GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base
+
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST_FFMPEG_DEPENDENCIES += orc
+endif
+
+GST_FFMPEG_CONF_OPT = \
+	--with-ffmpeg-extra-configure="--target-os=linux \
+				       --disable-ffmpeg \
+                                       --disable-ffplay \
+                                       --disable-ffserver \
+                                       --disable-avfilter \
+                                       --disable-swscale \
+                                       --enable-gpl \
+                                       --enable-nonfree \
+                                       --enable-postproc \
+                                       --enable-pthreads \
+                                       --enable-zlib \
+                                       --disable-avfilter \
+                                       --enable-postproc \
+                                       --enable-swscale \
+                                       --prefix=$(STAGING_DIR)/usr \
+                                       --enable-cross-compile \
+                                       --sysroot=$(STAGING_DIR) \
+                                       --host-cc=$(TARGET_CC) \
+                                       --cc=$(TARGET_CC) \
+                                       --arch=$(BR2_ARCH) \
+                                       --enable-cross-compile \
+                                       --cross-prefix=$(TARGET_CROSS) \
+                                       --disable-shared \
+                                       --enable-static \
+                                       --disable-encoders \
+                                       --disable-muxers \
+				       --disable-iwmmxt"
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 GST_FFMPEG_DEPENDENCIES += bzip2
Signature · 1 line
1.7.1
#10 lore raw

PATCH 6/9 gst-ffmpeg: depend on orc if it is enabled

Hello Sven,

Le Thu, 7 Jul 2011 09:39:05 +0200,
Sven Neumann <[email protected]> a ?crit :

package/multimedia/gst-ffmpeg/gst-ffmpeg.mk GST_FFMPEG_VERSION = 0.10.11 · line 12

Quoted 2 lines
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk +0 -2
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
-GST_FFMPEG_CONF_OPT = --with-system-ffmpeg

This patch does two things: depend on orc if it is enabled (as stated by the commit title), but it also switches gst-ffmpeg from the system ffmpeg to (apparently) an internal ffmpeg. Besides the fact that those two things should be done in two separate patches, could you elaborate on the reason why you switch from the system ffmpeg to the internal ffmpeg ? In general, in most Buildroot packages, we prefer to use external libraries, and they might also be used by other components in the system.

Thanks !

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#11 lore raw

PATCH 6/9 gst-ffmpeg: depend on orc if it is enabled

Quoted 5 lines · Thomas Petazzoni

Hello Sven,

Le Thu, 7 Jul 2011 09:39:05 +0200,
Sven Neumann <[email protected]> a ?crit :

Quoted 11 lines

package/multimedia/gst-ffmpeg/gst-ffmpeg.mk GST_FFMPEG_VERSION = 0.10.11 · line 12

Quoted 2 lines
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk +0 -2
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
-GST_FFMPEG_CONF_OPT = --with-system-ffmpeg

This patch does two things: depend on orc if it is enabled (as stated by the commit title), but it also switches gst-ffmpeg from the system ffmpeg to (apparently) an internal ffmpeg. Besides the fact that those two things should be done in two separate patches, could you elaborate on the reason why you switch from the system ffmpeg to the internal ffmpeg ? In general, in most Buildroot packages, we prefer to use external libraries, and they might also be used by other components in the system.

Oops, I should have indeed split this into two patches. And I would probably only have submitted the orc dependency. The switch to the internal ffmpeg is a good choice for us, but might not be desirable for others. Ideally there would be a br2 configuration option for this.

Sven

#12 lore raw

PATCH 6/9 gst-ffmpeg: depend on orc if it is enabled

Le Thu, 07 Jul 2011 15:17:58 +0200,
Sven Neumann <[email protected]> a ?crit :

Quoted 4 lines

Oops, I should have indeed split this into two patches. And I would probably only have submitted the orc dependency. The switch to the internal ffmpeg is a good choice for us, but might not be desirable for others.

Ok, could you resubmit a patch that only adds the orc dependency ?

Quoted 1 line

Ideally there would be a br2 configuration option for this.

Yes, this could be a solution. But is there any special advantage in using the internal ffmpeg vs. the system ffmpeg ? Of course, when you build things manually, using the internal ffmpeg is nicer, but since Buildroot takes care of the dependency, what is the advantage of the internal ffmpeg ?

Regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#13 lore raw

PATCH 6/9 gst-ffmpeg: depend on orc if it is enabled

Quoted 9 lines · Thomas Petazzoni

Le Thu, 07 Jul 2011 15:17:58 +0200,
Sven Neumann <[email protected]> a ?crit :

Quoted 4 lines

Oops, I should have indeed split this into two patches. And I would probably only have submitted the orc dependency. The switch to the internal ffmpeg is a good choice for us, but might not be desirable for others.

Ok, could you resubmit a patch that only adds the orc dependency ?

Sure. Will do so tomorrow.

Quoted 7 lines
Quoted 1 line

Ideally there would be a br2 configuration option for this.

Yes, this could be a solution. But is there any special advantage in using the internal ffmpeg vs. the system ffmpeg ? Of course, when you build things manually, using the internal ffmpeg is nicer, but since Buildroot takes care of the dependency, what is the advantage of the internal ffmpeg ?

Actually you get a pretty bad warning from gst-ffmpeg if you don't use the internal version. Using an external version of ffmpeg seems to be unsupported and considered a bad idea by the gst-ffmpeg developers. Probably because the ffmpeg API has a history of changing quite frequently without ever being released. As far as I can tell this has improved a little lately.

I don't remember the details, but after updating our buildroot, I tried to build with the external version, but didn't get far. Reverting to the internal version solved the issues for us.

Sven

author
#14 lore raw

PATCH 7/9 gst-plugins-ugly: add option dependency on orc package

In reply to Sven Neumann

Also remove the option for the libid3tag plug-in as is not any longer found in gst-plugins-ugly.

---
 package/multimedia/gst-plugins-ugly/Config.in      |    4 ----
 .../gst-plugins-ugly/gst-plugins-ugly.mk           |   11 ++++-------
 2 files changed, 4 insertions(+), 11 deletions(-)
package/multimedia/gst-plugins-ugly/Config.in +0 -4
index 9f738cf..e20426f 100644
@@ -38,10 +38,6 @@ config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA
 
 comment "plugins with external dependencies (there may be more available)"
 
-config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG
-	bool "id3tag"
-	select BR2_PACKAGE_LIBID3TAG
-
 config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD
 	bool "mad (*.mp3 audio)"
 	select BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG
package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk +4 -7
index a173df1..0d8d32d 100644
@@ -12,6 +12,10 @@ GST_PLUGINS_UGLY_CONF_OPT = \
 
 GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base
 
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST_PLUGINS_UGLY_DEPENDENCIES += orc
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
 GST_PLUGINS_UGLY_CONF_OPT += --enable-asfdemux
 else

@@ -60,13 +64,6 @@ else
 GST_PLUGINS_UGLY_CONF_OPT += --disable-synaesthesia
 endif
 
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ID3TAG),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-id3tag
-GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag
-else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-id3tag
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y)
 GST_PLUGINS_UGLY_CONF_OPT += --enable-mad
 GST_PLUGINS_UGLY_DEPENDENCIES += libmad
Signature · 1 line
1.7.1
author
#15 lore raw

PATCH 8/9 gst-plugins-good: add optional dependency on orc

In reply to Sven Neumann
---
 .../gst-plugins-good/gst-plugins-good.mk           |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/multimedia/gst-plugins-good/gst-plugins-good.mk +4 -0
index 8fbd120..afde749 100644
@@ -26,6 +26,10 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 
 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
 
+ifeq ($(BR2_PACKAGE_ORC),y)
+GST_PLUGINS_GOOD_DEPENDENCIES += orc
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
 GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
Signature · 1 line
1.7.1
author
#16 lore raw

PATCH 9/9 gst-plugins-good: update configuration options

In reply to Sven Neumann

Update the list of plugins that can be selected/deselected.

---
 package/multimedia/gst-plugins-good/Config.in      |    9 +++++++++
 .../gst-plugins-good/gst-plugins-good.mk           |   18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)
package/multimedia/gst-plugins-good/Config.in +9 -0
index 368642f..b431603 100644
@@ -82,6 +82,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX
 	bool "icydemux"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE
+	bool "imagefreeze"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE
 	bool "interleave"
 

@@ -127,6 +130,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP
 	bool "rtsp"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE
+	bool "shapewipe"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE
 	bool "smpte"
 

@@ -180,6 +186,9 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
 	bool "ossaudio (OSS audio)"
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
+	bool "oss4 (Open Sound System 4)"
+
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
 	select BR2_PACKAGE_LIBSOUP
package/multimedia/gst-plugins-good/gst-plugins-good.mk +18 -0
index afde749..d037031 100644
@@ -148,6 +148,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-interleave
 else

@@ -238,6 +244,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-smpte
 else

@@ -325,6 +337,12 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-oss
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-soup
 GST_PLUGINS_GOOD_DEPENDENCIES += libsoup
Signature · 1 line
1.7.1