* [Buildroot] [PATCH 4/4] gstreamer: replace gst-ffmpeg with gst-libav
From: bogdan at nimblex.org @ 2012-12-19 16:58 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355936324-9585-1-git-send-email-bogdan@nimblex.org>
From: Bogdan Radulescu <bogdan@nimblex.net>
Replaced gst-ffmepg with gst-libav plug-in.
Didn't use external libav since the gstreamer guys use a snapshot instead of a release of libav.
Removed gst-dsp and gst-omapfb as they are not available for gstreamer-1.0
Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
---
package/multimedia/Config.in | 4 +---
package/multimedia/gst-dsp/Config.in | 8 -------
package/multimedia/gst-dsp/gst-dsp.mk | 18 ---------------
package/multimedia/gst-ffmpeg/Config.in | 17 ---------------
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 18 ---------------
package/multimedia/gst-libav/Config.in | 16 ++++++++++++++
package/multimedia/gst-libav/gst-libav.mk | 34 +++++++++++++++++++++++++++++
package/multimedia/gst-omapfb/Config.in | 7 ------
package/multimedia/gst-omapfb/gst-omapfb.mk | 19 ----------------
9 files changed, 51 insertions(+), 90 deletions(-)
delete mode 100644 package/multimedia/gst-dsp/Config.in
delete mode 100644 package/multimedia/gst-dsp/gst-dsp.mk
delete mode 100644 package/multimedia/gst-ffmpeg/Config.in
delete mode 100644 package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
create mode 100644 package/multimedia/gst-libav/Config.in
create mode 100644 package/multimedia/gst-libav/gst-libav.mk
delete mode 100644 package/multimedia/gst-omapfb/Config.in
delete mode 100644 package/multimedia/gst-omapfb/gst-omapfb.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 273d9bc..5ff7b4a 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -6,9 +6,7 @@ source "package/multimedia/faad2/Config.in"
source "package/multimedia/flac/Config.in"
source "package/multimedia/ffmpeg/Config.in"
source "package/multimedia/gstreamer/Config.in"
-source "package/multimedia/gst-ffmpeg/Config.in"
-source "package/multimedia/gst-dsp/Config.in"
-source "package/multimedia/gst-omapfb/Config.in"
+source "package/multimedia/gst-libav/Config.in"
source "package/multimedia/gst-plugins-base/Config.in"
source "package/multimedia/gst-plugins-good/Config.in"
source "package/multimedia/gst-plugins-bad/Config.in"
diff --git a/package/multimedia/gst-dsp/Config.in b/package/multimedia/gst-dsp/Config.in
deleted file mode 100644
index 590931a..0000000
--- a/package/multimedia/gst-dsp/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_GST_DSP
- bool "gst-dsp"
- depends on BR2_PACKAGE_GSTREAMER && BR2_cortex_a8
- select BR2_PACKAGE_TIDSP_BINARIES
- help
- GStreamer plug-in to access TI OMAP3 DSP algorithms.
-
- http://code.google.com/p/gst-dsp/
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk
deleted file mode 100644
index 74b4c98..0000000
--- a/package/multimedia/gst-dsp/gst-dsp.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-GST_DSP_VERSION = 0.10.2
-GST_DSP_SITE = http://gst-dsp.googlecode.com/files/
-
-define GST_DSP_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e
-endef
-
-define GST_DSP_INSTALL_TARGET_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install
-endef
-
-define GST_DSP_UNINSTALL_TARGET_CMDS
- $(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstdsp.so
-endef
-
-GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkgconf
-
-$(eval $(generic-package))
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
deleted file mode 100644
index 537101e..0000000
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config BR2_PACKAGE_GST_FFMPEG
- bool "gst-ffmpeg"
- depends on BR2_PACKAGE_GSTREAMER
- select BR2_PACKAGE_GST_PLUGINS_BASE
- select BR2_PACKAGE_FFMPEG
- select BR2_PACKAGE_FFMPEG_GPL
- select BR2_PACKAGE_FFMPEG_POSTPROC
- select BR2_PACKAGE_FFMPEG_SWSCALE
- depends on BR2_LARGEFILE
- depends on BR2_INET_IPV6
- help
- GStreamer plugin using FFmpeg.
-
- http://gstreamer.freedesktop.org/
-
-comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
- depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
deleted file mode 100644
index 2570cea..0000000
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################################################
-#
-# gst-ffmpeg
-#
-#############################################################
-
-GST_FFMPEG_VERSION = 0.11.2
-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 = host-pkgconf gstreamer gst-plugins-base ffmpeg
-GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
-
-ifeq ($(BR2_PACKAGE_BZIP2),y)
-GST_FFMPEG_DEPENDENCIES += bzip2
-endif
-
-$(eval $(autotools-package))
diff --git a/package/multimedia/gst-libav/Config.in b/package/multimedia/gst-libav/Config.in
new file mode 100644
index 0000000..1365256
--- /dev/null
+++ b/package/multimedia/gst-libav/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_GST_LIBAV
+ bool "gst-libav"
+ depends on BR2_PACKAGE_GSTREAMER
+ select BR2_PACKAGE_GST_PLUGINS_BASE
+ depends on BR2_LARGEFILE
+ help
+ GStreamer plugin (formerly gst-ffmpeg).
+
+ This package is an implementation of the former
+ gst-ffmpeg plugin but there is a lot missing from it.
+ So far it only support decoding WMA and AAC.
+
+ http://gstreamer.freedesktop.org/
+
+comment "gst-libav requires a toolchain with LARGEFILE support"
+ depends on !(BR2_LARGEFILE)
diff --git a/package/multimedia/gst-libav/gst-libav.mk b/package/multimedia/gst-libav/gst-libav.mk
new file mode 100644
index 0000000..cff69b2
--- /dev/null
+++ b/package/multimedia/gst-libav/gst-libav.mk
@@ -0,0 +1,34 @@
+
+#############################################################
+#
+# gst-libav
+#
+#############################################################
+
+GST_LIBAV_VERSION = 1.0.3
+GST_LIBAV_SOURCE = gst-libav-$(GST_LIBAV_VERSION).tar.xz
+GST_LIBAV_SITE = http://gstreamer.freedesktop.org/src/gst-libav
+GST_LIBAV_INSTALL_STAGING = YES
+
+GST_LIBAV_DEPENDENCIES = host-pkgconf gstreamer
+
+GST_LIBAV_CONF_OPT = \
+ --with-libav-extra-configure="--target-os=linux \
+ --disable-debug \
+ --enable-pthreads \
+ --enable-zlib \
+ --prefix=$(STAGING_DIR)/usr \
+ --sysroot=$(STAGING_DIR) \
+ --host-cc=$(TARGET_CC) \
+ --cc=$(TARGET_CC) \
+ --arch=$(BR2_ARCH) \
+ --enable-cross-compile \
+ --cross-prefix=$(TARGET_CROSS) \
+ --disable-shared \
+ --enable-static"
+
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+GST_LIBAV_DEPENDENCIES += bzip2
+endif
+
+$(eval $(autotools-package))
diff --git a/package/multimedia/gst-omapfb/Config.in b/package/multimedia/gst-omapfb/Config.in
deleted file mode 100644
index e603cb1..0000000
--- a/package/multimedia/gst-omapfb/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_GST_OMAPFB
- bool "gst-omapfb"
- depends on BR2_PACKAGE_GSTREAMER && BR2_cortex_a8
- help
- GStreamer plug-in to use OMAP framebuffer.
-
- http://github.com/felipec/gst-omapfb
diff --git a/package/multimedia/gst-omapfb/gst-omapfb.mk b/package/multimedia/gst-omapfb/gst-omapfb.mk
deleted file mode 100644
index f23bc86..0000000
--- a/package/multimedia/gst-omapfb/gst-omapfb.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-GST_OMAPFB_VERSION=1.0
-GST_OMAPFB_SOURCE=gst-omapfb-$(GST_OMAPFB_VERSION).tar.gz
-GST_OMAPFB_SITE=http://gst-dsp.googlecode.com/files/
-
-define GST_OMAPFB_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e
-endef
-
-define GST_OMAPFB_INSTALL_TARGET_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install
-endef
-
-define GST_OMAPFB_UNINSTALL_TARGET_CMDS
- $(RM) $(TARGET_DIR)/usr/lib/gstreamer-0.10/libgstomapfb.so
-endef
-
-GST_OMAPFB_DEPENDENCIES = gstreamer
-
-$(eval $(generic-package))
--
1.7.12.1
^ permalink raw reply related
* [Buildroot] [PATCH 3/4] gstreamer: adjust set of plug-ins for gstreamer-1.0
From: bogdan at nimblex.org @ 2012-12-19 16:58 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355936324-9585-1-git-send-email-bogdan@nimblex.org>
From: Bogdan Radulescu <bogdan@nimblex.net>
Added wavpack to gst-plugins-good and opus to gst-plugins-bad
Added videoconvert to gst-plugins-base and gdkpixbuf to gst-plugins-good.
Deleted plugins which will not be ported to gstreamer-1.0.
Added FAAD
Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
---
package/multimedia/gst-plugins-bad/Config.in | 22 +++---
...d-opus-jpegformat-unbreak-non-debug-build.patch | 78 ----------------------
.../multimedia/gst-plugins-bad/gst-plugins-bad.mk | 30 +++++----
package/multimedia/gst-plugins-base/Config.in | 10 +--
.../gst-plugins-base/gst-plugins-base.mk | 18 ++---
package/multimedia/gst-plugins-good/Config.in | 8 +++
.../gst-plugins-good/gst-plugins-good.mk | 14 ++++
7 files changed, 59 insertions(+), 121 deletions(-)
delete mode 100644 package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index d87aec4..ed43533 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -33,9 +33,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER
bool "bayer"
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN
- bool "camerabin"
-
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2
bool "camerabin2"
@@ -82,9 +79,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS
bool "fieldanalysis"
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE
- bool "freeze"
-
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB
bool "freeverb"
@@ -208,12 +202,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH
bool "smooth"
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED
- bool "speed"
-
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC
bool "subenc"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED
+ bool "speed"
+
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO
bool "stereo"
@@ -241,7 +235,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M
bool "y4m"
-comment "plugins with external dependencies (there may be more available)"
+comment "plugins with external dependencies (not all from gstreamer are here)"
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK
bool "apexsink"
@@ -267,6 +261,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
bool "dvb"
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD
+ bool "faad"
+ select BR2_PACKAGE_FAAD2
+
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV
bool "fbdev"
@@ -274,6 +272,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
bool "libmms"
select BR2_PACKAGE_LIBMMS
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPG123
+ bool "mpg123"
+ select BR2_PACKAGE_MMPG123
+
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
bool "musepack"
select BR2_PACKAGE_MUSEPACK
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch b/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
deleted file mode 100644
index 2c98c3e..0000000
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad-opus-jpegformat-unbreak-non-debug-build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Wed, 12 Sep 2012 09:10:35 +0200
-Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build
-
-opus + jpegformat plugin builds fail when gstreamer is configured with
---disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol
-instead of GST_DISABLE_GST_DEBUG.
-
-Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- ext/opus/gstopusdec.c | 2 +-
- ext/opus/gstopusenc.c | 4 ++--
- gst/jpegformat/gstjpegparse.c | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
-index 0e2805c..ab7221d 100644
---- a/ext/opus/gstopusdec.c
-+++ b/ext/opus/gstopusdec.c
-@@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer)
-
- GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz",
- dec->n_channels, dec->sample_rate);
--#ifndef GST_DISABLE_DEBUG
-+#ifndef GST_DISABLE_GST_DEBUG
- gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug,
- "Mapping table", dec->n_channels, dec->channel_mapping);
- #endif
-diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
-index 240a2cb..d991795 100644
---- a/ext/opus/gstopusenc.c
-+++ b/ext/opus/gstopusenc.c
-@@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc,
- }
- }
-
--#ifndef GST_DISABLE_DEBUG
-+#ifndef GST_DISABLE_GST_DEBUG
- GST_INFO_OBJECT (enc,
- "Mapping tables built: %d channels, %d stereo streams", enc->n_channels,
- enc->n_stereo_streams);
-@@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc)
- {
- int error = OPUS_OK;
-
--#ifndef GST_DISABLE_DEBUG
-+#ifndef GST_DISABLE_GST_DEBUG
- GST_DEBUG_OBJECT (enc,
- "setup: %d Hz, %d channels, %d stereo streams, family %d",
- enc->sample_rate, enc->n_channels, enc->n_stereo_streams,
-diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
-index f984a52..b4af9ed 100644
---- a/gst/jpegformat/gstjpegparse.c
-+++ b/gst/jpegformat/gstjpegparse.c
-@@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
- if (!gst_byte_reader_get_uint16_be (reader, &size))
- return FALSE;
-
--#ifndef GST_DISABLE_DEBUG
-+#ifndef GST_DISABLE_GST_DEBUG
- /* We'd pry the id of the skipped application segment */
- if (marker >= APP0 && marker <= APP15) {
- const gchar *id_str = NULL;
-@@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
- #else
- GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker,
- size);
--#endif // GST_DISABLE_DEBUG
-+#endif // GST_DISABLE_GST_DEBUG
-
- if (!gst_byte_reader_skip (reader, size - 2))
- return FALSE;
---
-1.7.10
-
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 714c987..6cfce08 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -3,8 +3,8 @@
# gst-plugins-bad
#
#############################################################
-GST_PLUGINS_BAD_VERSION = 0.10.23
-GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.bz2
+GST_PLUGINS_BAD_VERSION = 1.0.3
+GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
GST_PLUGINS_BAD_CONF_OPT = \
@@ -58,12 +58,6 @@ else
GST_PLUGINS_BAD_CONF_OPT += --disable-bayer
endif
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
-endif
-
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
else
@@ -148,12 +142,6 @@ else
GST_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
endif
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-freeze
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-freeze
-endif
-
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y)
GST_PLUGINS_BAD_CONF_OPT += --enable-freeverb
else
@@ -508,6 +496,13 @@ else
GST_PLUGINS_BAD_CONF_OPT += --disable-dvb
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST_PLUGINS_BAD_DEPENDENCIES += faad2
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-faad
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y)
GST_PLUGINS_BAD_CONF_OPT += --enable-fbdev
else
@@ -521,6 +516,13 @@ else
GST_PLUGINS_BAD_CONF_OPT += --disable-libmms
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPG123),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-mpg123
+GST_PLUGINS_BAD_DEPENDENCIES += mpg123
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-mpg123
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
GST_PLUGINS_BAD_CONF_OPT += --enable-musepack
GST_PLUGINS_BAD_DEPENDENCIES += musepack
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 5d82533..4abfec6 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -36,13 +36,6 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_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
-
-config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP
- bool "gdp"
-
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK
bool "playback (mandatory)"
default y
@@ -57,6 +50,9 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND
bool "typefind (mandatory)"
default y
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
+ bool "videoconvert"
+
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC
bool "videotestsrc"
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index f4aab00..0203c5f 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -89,18 +89,6 @@ 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
-GST_PLUGINS_BASE_CONF_OPT += --disable-ffmpegcolorspace
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-gdp
-else
-GST_PLUGINS_BASE_CONF_OPT += --disable-gdp
-endif
-
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y)
GST_PLUGINS_BASE_CONF_OPT += --enable-playback
else
@@ -125,6 +113,12 @@ else
GST_PLUGINS_BASE_CONF_OPT += --disable-typefind
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-videoconvert
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-videoconvert
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y)
GST_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc
else
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 33ecb5c..92a56c8 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -79,6 +79,10 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX
bool "flx"
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
+ bool "gdkpixbuf"
+ select BR2_PACKAGE_GDK_PIXBUF
+
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM
bool "goom"
@@ -204,4 +208,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
bool "speex"
select BR2_PACKAGE_SPEEX
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK
+ bool "wavpack (*.wv audio)"
+ select BR2_PACKAGE_WAVPACK
+
endif
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 1eefd45..a184055 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -147,6 +147,13 @@ else
GST_PLUGINS_GOOD_CONF_OPT += --disable-flx
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y)
GST_PLUGINS_GOOD_CONF_OPT += --enable-goom
else
@@ -303,6 +310,13 @@ else
GST_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST_PLUGINS_GOOD_DEPENDENCIES += wavpack
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
GST_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
else
--
1.7.12.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] gstreamer: port to gstreamer-1.0
From: bogdan at nimblex.org @ 2012-12-19 16:58 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355936324-9585-1-git-send-email-bogdan@nimblex.org>
From: Bogdan Radulescu <bogdan@nimblex.net>
Initial commit of updated gstreamer + plugins which compile
Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
---
package/multimedia/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
.../gst-plugins-base/gst-plugins-base-tremor.patch | 139 ---------------------
.../gst-plugins-base/gst-plugins-base.mk | 4 +-
.../gst-plugins-good-linux36.patch | 37 ------
.../gst-plugins-good/gst-plugins-good.mk | 4 +-
.../gst-plugins-ugly/gst-plugins-ugly.mk | 4 +-
package/multimedia/gstreamer/gstreamer.mk | 4 +-
7 files changed, 9 insertions(+), 185 deletions(-)
delete mode 100644 package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
delete mode 100644 package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index ead490e..2570cea 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -4,7 +4,7 @@
#
#############################################################
-GST_FFMPEG_VERSION = 0.10.13
+GST_FFMPEG_VERSION = 0.11.2
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
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch b/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
deleted file mode 100644
index fa8785b..0000000
--- a/package/multimedia/gst-plugins-base/gst-plugins-base-tremor.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 0088753651350de3060ece22c1be4153b6009515 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Wed, 25 Jan 2012 23:53:04 +0100
-Subject: [PATCH] base: vorbisdeclib: support modern Tremor versions
-
-Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=668726
-
-Tremor changed to use standard libogg rather than its own incompatible
-copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail.
-
-Tremolo so far unfortunately hasn't been updated. Restructure
-vorbisdeclib.h so the legacy _ogg_packet_wrapper code is only used for
-Tremolo.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- ext/vorbis/gstvorbisdeclib.h | 77 ++++++++++++++++++++++-------------------
- 1 files changed, 41 insertions(+), 36 deletions(-)
-
-diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h
-index ca00af9..e147591 100644
---- a/ext/vorbis/gstvorbisdeclib.h
-+++ b/ext/vorbis/gstvorbisdeclib.h
-@@ -29,11 +29,6 @@
-
- #ifndef TREMOR
-
--#include <vorbis/codec.h>
--
--typedef float vorbis_sample_t;
--typedef ogg_packet ogg_packet_wrapper;
--
- #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio"
-
- #define GST_VORBIS_DEC_SRC_CAPS \
-@@ -47,6 +42,42 @@ typedef ogg_packet ogg_packet_wrapper;
-
- #define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec
-
-+#else /* TREMOR */
-+
-+#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
-+
-+#define GST_VORBIS_DEC_SRC_CAPS \
-+ GST_STATIC_CAPS ("audio/x-raw-int, " \
-+ "rate = (int) [ 1, MAX ], " \
-+ "channels = (int) [ 1, 6 ], " \
-+ "endianness = (int) BYTE_ORDER, " \
-+ "width = (int) { 16, 32 }, " \
-+ "depth = (int) 16, " \
-+ "signed = (boolean) true")
-+
-+#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16)
-+
-+/* we need a different type name here */
-+#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec
-+
-+/* and still have it compile */
-+typedef struct _GstVorbisDec GstIVorbisDec;
-+typedef struct _GstVorbisDecClass GstIVorbisDecClass;
-+
-+#endif /* TREMOR */
-+
-+#ifndef USE_TREMOLO
-+
-+#ifdef TREMOR
-+ #include <tremor/ivorbiscodec.h>
-+ typedef ogg_int32_t vorbis_sample_t;
-+#else
-+ #include <vorbis/codec.h>
-+ typedef float vorbis_sample_t;
-+#endif
-+
-+typedef ogg_packet ogg_packet_wrapper;
-+
- static inline guint8 *
- gst_ogg_packet_data (ogg_packet * p)
- {
-@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet)
- return packet;
- }
-
--#else
--
--#ifdef USE_TREMOLO
-- #include <Tremolo/ivorbiscodec.h>
-- #include <Tremolo/codec_internal.h>
-- typedef ogg_int16_t vorbis_sample_t;
--#else
-- #include <tremor/ivorbiscodec.h>
-- typedef ogg_int32_t vorbis_sample_t;
--#endif
-+#else /* USE_TREMOLO */
-
-+#include <Tremolo/ivorbiscodec.h>
-+#include <Tremolo/codec_internal.h>
-+typedef ogg_int16_t vorbis_sample_t;
- typedef struct _ogg_packet_wrapper ogg_packet_wrapper;
-
- struct _ogg_packet_wrapper {
-@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper {
- ogg_buffer buf;
- };
-
--#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
--
--#define GST_VORBIS_DEC_SRC_CAPS \
-- GST_STATIC_CAPS ("audio/x-raw-int, " \
-- "rate = (int) [ 1, MAX ], " \
-- "channels = (int) [ 1, 6 ], " \
-- "endianness = (int) BYTE_ORDER, " \
-- "width = (int) { 16, 32 }, " \
-- "depth = (int) 16, " \
-- "signed = (boolean) true")
--
--#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16)
--
--/* we need a different type name here */
--#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec
--
--/* and still have it compile */
--typedef struct _GstVorbisDec GstIVorbisDec;
--typedef struct _GstVorbisDecClass GstIVorbisDecClass;
--
- /* compensate minor variation */
- #define vorbis_synthesis(a, b) vorbis_synthesis (a, b, 1)
-
-@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet)
- return &(packet->packet);
- }
-
--#endif
-+#endif /* USE_TREMOLO */
-
- typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in,
- guint samples, gint channels, gint width);
---
-1.7.8.3
-
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index b044516..f4aab00 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -3,8 +3,8 @@
# gst-plugins-base
#
#############################################################
-GST_PLUGINS_BASE_VERSION = 0.10.36
-GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.bz2
+GST_PLUGINS_BASE_VERSION = 1.0.3
+GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz
GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
GST_PLUGINS_BASE_INSTALL_STAGING = YES
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch b/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
deleted file mode 100644
index 5d7cd93..0000000
--- a/package/multimedia/gst-plugins-good/gst-plugins-good-linux36.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix building with Linux headers 3.6
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-
-From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 09 Aug 2012 07:35:23 +0000
-Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
-
-This was unused apparently and removed in the kernel in commit:
-
- From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
- From: Sakari Ailus <sakari.ailus@iki.fi>
- Date: Wed, 2 May 2012 09:40:03 -0300
- Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
-
- Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
- tells the former is valid. The flag is used by no driver currently.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681491
----
-(limited to 'sys/v4l2/gstv4l2bufferpool.c')
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index 2e3a563..5aaed5a 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
- GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
- ret->vbuffer.m.offset);
- GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
-- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
-
- ret->mmap_length = ret->vbuffer.length;
- data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index f64527d..1eefd45 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -3,8 +3,8 @@
# gst-plugins-good
#
#############################################################
-GST_PLUGINS_GOOD_VERSION = 0.10.31
-GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.bz2
+GST_PLUGINS_GOOD_VERSION = 1.0.3
+GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
GST_PLUGINS_GOOD_CONF_OPT = \
diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
index e23d774..c9bc653 100644
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -3,8 +3,8 @@
# gst-plugins-ugly
#
#############################################################
-GST_PLUGINS_UGLY_VERSION = 0.10.19
-GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.bz2
+GST_PLUGINS_UGLY_VERSION = 1.0.3
+GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST_PLUGINS_UGLY_CONF_OPT = \
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index b87f029..0253da2 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -4,8 +4,8 @@
# gstreamer
#
#############################################################
-GSTREAMER_VERSION = 0.10.36
-GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.bz2
+GSTREAMER_VERSION = 1.0.3
+GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz
GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
GSTREAMER_INSTALL_STAGING = YES
--
1.7.12.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/4] libglib2: bumped version to 2.32.4
From: bogdan at nimblex.org @ 2012-12-19 16:58 UTC (permalink / raw)
To: buildroot
From: Sven Neumann <s.neumann@raumfeld.com>
Bump libglib2 to a newer stable version.
There are a few changes to the configure options necessary
in order to make it compile cleanly and work correctly.
The patch has been tested on ARM and i486. Some things
might have to be adjusted for other platforms.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
...b2-make-codegen-python2-python3-compliant.patch | 192 ---------------------
...glib2-xdgmime-return-early-for-empty-data.patch | 31 ++++
package/libglib2/libglib2.mk | 15 +-
3 files changed, 39 insertions(+), 199 deletions(-)
delete mode 100644 package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
create mode 100644 package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch
diff --git a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch b/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
deleted file mode 100644
index b483827..0000000
--- a/package/libglib2/libglib2-make-codegen-python2-python3-compliant.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Fetch from http://git.gnome.org/browse/glib/patch/?id=03611f7c0670ea14eedbc121972aed7ce60bb9ee
-
-This patch is already included upstream, from the glib-2.32.4 release.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
-From 03611f7c0670ea14eedbc121972aed7ce60bb9ee Mon Sep 17 00:00:00 2001
-From: Simon Feltman <s.feltman@gmail.com>
-Date: Thu, 14 Jun 2012 06:20:17 +0000
-Subject: Updated codegen to work with python3.
-
-Most changes were just replacing usage of "has_key" with "in".
-Also updated the sorting function which was simplified and
-changed to a "key" function instead of "cmp" (which is no longer
-supported in python3. Verified everything builds with
-python 2.7 and 3.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678066
----
-diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py
-index 41ea8fa..bca3490 100644
---- a/gio/gdbus-2.0/codegen/codegen.py
-+++ b/gio/gdbus-2.0/codegen/codegen.py
-@@ -304,11 +304,8 @@ class CodeGenerator:
- #
- # See https://bugzilla.gnome.org/show_bug.cgi?id=647577#c5
- # for discussion
-- keys = function_pointers.keys()
-- if len(keys) > 0:
-- keys.sort(cmp=utils.my_version_cmp)
-- for key in keys:
-- self.h.write('%s'%function_pointers[key])
-+ for key in sorted(function_pointers.keys(), key=utils.version_cmp_key):
-+ self.h.write('%s'%function_pointers[key])
-
- self.h.write('};\n')
- self.h.write('\n')
-@@ -1022,11 +1019,9 @@ class CodeGenerator:
- value = '@get_%s: '%(p.name_lower)
- value += 'Getter for the #%s:%s property.'%(i.camel_name, p.name_hyphen)
- doc_bits[key] = value
-- keys = doc_bits.keys()
-- if len(keys) > 0:
-- keys.sort(cmp=utils.my_version_cmp)
-- for key in keys:
-- self.c.write(' * %s\n'%doc_bits[key])
-+ for key in sorted(doc_bits.keys(), key=utils.version_cmp_key):
-+ self.c.write(' * %s\n'%doc_bits[key])
-+
- self.c.write(self.docbook_gen.expand(
- ' *\n'
- ' * Virtual table for the D-Bus interface #%s.\n'
-diff --git a/gio/gdbus-2.0/codegen/codegen_docbook.py b/gio/gdbus-2.0/codegen/codegen_docbook.py
-index 4ceef57..00581f1 100644
---- a/gio/gdbus-2.0/codegen/codegen_docbook.py
-+++ b/gio/gdbus-2.0/codegen/codegen_docbook.py
-@@ -259,14 +259,12 @@ class DocbookCodeGenerator:
- self.expand_member_dict[key] = value
- # Make sure to expand the keys in reverse order so e.g. #org.foo.Iface:MediaCompat
- # is evaluated before #org.foo.Iface:Media ...
-- self.expand_member_dict_keys = self.expand_member_dict.keys()
-- self.expand_member_dict_keys.sort(reverse=True)
-- self.expand_iface_dict_keys = self.expand_iface_dict.keys()
-- self.expand_iface_dict_keys.sort(reverse=True)
-+ self.expand_member_dict_keys = sorted(self.expand_member_dict.keys(), reverse=True)
-+ self.expand_iface_dict_keys = sorted(self.expand_iface_dict.keys(), reverse=True)
-
- def generate(self):
- for i in self.ifaces:
-- self.out = file('%s-%s.xml'%(self.docbook, i.name), 'w')
-+ self.out = open('%s-%s.xml'%(self.docbook, i.name), 'w')
- self.out.write(''%())
- self.out.write('<?xml version="1.0" encoding="utf-8"?>\n'%())
- self.out.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n'%())
-diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
-index 76c838c..735cc1f 100755
---- a/gio/gdbus-2.0/codegen/codegen_main.py
-+++ b/gio/gdbus-2.0/codegen/codegen_main.py
-@@ -184,8 +184,8 @@ def codegen_main():
-
- c_code = opts.generate_c_code
- if c_code:
-- h = file(c_code + '.h', 'w')
-- c = file(c_code + '.c', 'w')
-+ h = open(c_code + '.h', 'w')
-+ c = open(c_code + '.c', 'w')
- gen = codegen.CodeGenerator(all_ifaces,
- opts.c_namespace,
- opts.interface_prefix,
-diff --git a/gio/gdbus-2.0/codegen/parser.py b/gio/gdbus-2.0/codegen/parser.py
-index 5fabd44..7b9d216 100644
---- a/gio/gdbus-2.0/codegen/parser.py
-+++ b/gio/gdbus-2.0/codegen/parser.py
-@@ -152,12 +152,12 @@ class DBusXMLParser:
- self.state = DBusXMLParser.STATE_IGNORED
-
- # assign docs, if any
-- if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-+ if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
- self._cur_object.doc_string = self.doc_comment_body
-- if self.doc_comment_params.has_key('short_description'):
-+ if 'short_description' in self.doc_comment_params:
- short_description = self.doc_comment_params['short_description']
- self._cur_object.doc_string_brief = short_description
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_INTERFACE:
-@@ -185,16 +185,16 @@ class DBusXMLParser:
- self.state = DBusXMLParser.STATE_IGNORED
-
- # assign docs, if any
-- if attrs.has_key('name') and self.doc_comment_last_symbol == attrs['name']:
-+ if 'name' in attrs and self.doc_comment_last_symbol == attrs['name']:
- self._cur_object.doc_string = self.doc_comment_body
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_METHOD:
- if name == DBusXMLParser.STATE_ARG:
- self.state = DBusXMLParser.STATE_ARG
- arg_name = None
-- if attrs.has_key('name'):
-+ if 'name' in attrs:
- arg_name = attrs['name']
- arg = dbustypes.Arg(arg_name, attrs['type'])
- direction = attrs['direction']
-@@ -215,18 +215,18 @@ class DBusXMLParser:
-
- # assign docs, if any
- if self.doc_comment_last_symbol == old_cur_object.name:
-- if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-+ if 'name' in attrs and attrs['name'] in self.doc_comment_params:
- doc_string = self.doc_comment_params[attrs['name']]
- if doc_string != None:
- self._cur_object.doc_string = doc_string
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_SIGNAL:
- if name == DBusXMLParser.STATE_ARG:
- self.state = DBusXMLParser.STATE_ARG
- arg_name = None
-- if attrs.has_key('name'):
-+ if 'name' in attrs:
- arg_name = attrs['name']
- arg = dbustypes.Arg(arg_name, attrs['type'])
- self._cur_object.args.append(arg)
-@@ -241,11 +241,11 @@ class DBusXMLParser:
-
- # assign docs, if any
- if self.doc_comment_last_symbol == old_cur_object.name:
-- if attrs.has_key('name') and self.doc_comment_params.has_key(attrs['name']):
-+ if 'name' in attrs and attrs['name'] in self.doc_comment_params:
- doc_string = self.doc_comment_params[attrs['name']]
- if doc_string != None:
- self._cur_object.doc_string = doc_string
-- if self.doc_comment_params.has_key('since'):
-+ if 'since' in self.doc_comment_params:
- self._cur_object.since = self.doc_comment_params['since']
-
- elif self.state == DBusXMLParser.STATE_PROPERTY:
-diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
-index 94bd05c..239b64e 100644
---- a/gio/gdbus-2.0/codegen/utils.py
-+++ b/gio/gdbus-2.0/codegen/utils.py
-@@ -97,15 +97,8 @@ def lookup_brief_docs(annotations):
- else:
- return s
-
--# I'm sure this could be a lot more elegant if I was
--# more fluent in python...
--def my_version_cmp(a, b):
-- if len(a[0]) > 0 and len(b[0]) > 0:
-- va = distutils.version.LooseVersion(a[0])
-- vb = distutils.version.LooseVersion(b[0])
-- ret = va.__cmp__(vb)
-- else:
-- ret = cmp(a[0], b[0])
-- if ret != 0:
-- return ret
-- return cmp(a[1], b[1])
-+def version_cmp_key(key):
-+ # If the 'since' version is empty put a 0 in its place as this will
-+ # allow LooseVersion to work and will always compare lower.
-+ v = key[0] if key[0] else '0'
-+ return (distutils.version.LooseVersion(v), key[1])
---
-cgit v0.9.0.2
diff --git a/package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch b/package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch
new file mode 100644
index 0000000..17fed92
--- /dev/null
+++ b/package/libglib2/libglib2-xdgmime-return-early-for-empty-data.patch
@@ -0,0 +1,31 @@
+From 9689286b990709414227030a13ac2f287fed5a9c Mon Sep 17 00:00:00 2001
+From: Sven Neumann <s.neumann@raumfeld.com>
+Date: Mon, 9 Jul 2012 12:13:48 +0200
+Subject: [PATCH] xdgmime: return early for empty data
+
+Add a check for the data length to xdg_mime_get_mime_type_for_data()
+and return early for len == 0 instead of crashing later in
+cache_magic_matchlet_compare().
+
+Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
+---
+ gio/xdgmime/xdgmime.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c
+index 846be39..9e53500 100644
+--- a/gio/xdgmime/xdgmime.c
++++ b/gio/xdgmime/xdgmime.c
+@@ -467,6 +467,9 @@ xdg_mime_get_mime_type_for_data (const void *data,
+ {
+ const char *mime_type;
+
++ if (len == 0)
++ return XDG_MIME_TYPE_UNKNOWN;
++
+ xdg_mime_init ();
+
+ if (_caches)
+--
+1.7.9.5
+
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index c3e510b..b476200 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,8 +3,9 @@
# libglib2
#
#############################################################
-LIBGLIB2_VERSION_MAJOR = 2.30
-LIBGLIB2_VERSION_MINOR = 3
+
+LIBGLIB2_VERSION_MAJOR = 2.32
+LIBGLIB2_VERSION_MINOR = 4
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
@@ -13,6 +14,7 @@ LIBGLIB2_INSTALL_STAGING = YES
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
LIBGLIB2_CONF_ENV = \
+ CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \
ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
@@ -40,8 +42,10 @@ LIBGLIB2_CONF_ENV = \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
- ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \
- ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \
+ ac_cv_func_posix_getgrgid_r=no \
+ ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=8 ac_cv_alignof_unsigned_long=4 \
+ ac_cv_func_newlocale=no ac_cv_func_uselocale=no \
+ ac_cv_func_strtod_l=no ac_cv_func_strtoll_l=no ac_cv_func_strtoull_l=no \
gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
# old uClibc versions don't provide qsort_r
@@ -54,9 +58,6 @@ endif
HOST_LIBGLIB2_CONF_OPT = \
--disable-gtk-doc \
--enable-debug=no \
- --disable-dtrace \
- --disable-systemtap \
- --disable-gcov
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
--
1.7.12.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] gstreamer: port to gstreamer-1.0
From: Peter Korsgaard @ 2012-12-19 16:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1565829996.1426028.1355934869325.JavaMail.root@advansee.com>
>>>>> "Beno?t" == Beno?t Th?baudeau <benoit.thebaudeau@advansee.com> writes:
Beno?t> Dear Bogdan Radulescu,
Beno?t> On Wednesday, December 19, 2012 5:58:42 PM, Bogdan Radulescu wrote:
>> From: Bogdan Radulescu <bogdan@nimblex.net>
>>
>> Initial commit of updated gstreamer + plugins which compile
>>
>> Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
Beno?t> Some environments are not yet gst-1.0-ready, especially for
Beno?t> network streaming. Wouldn't it be useful, at least for some
Beno?t> time, to have the choice between 0.10, 1.0, or both (they can
Beno?t> be installed side by side without any conflict)?
Indeed. Either as a version selection in gstreamer (like E.G. busybox)
or as a seperate BR2_PACKAGE_GSTREAMER_10 if the differences are too
big.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 2/4] gstreamer: port to gstreamer-1.0
From: Benoît Thébaudeau @ 2012-12-19 16:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355936324-9585-2-git-send-email-bogdan@nimblex.org>
Dear Bogdan Radulescu,
On Wednesday, December 19, 2012 5:58:42 PM, Bogdan Radulescu wrote:
> From: Bogdan Radulescu <bogdan@nimblex.net>
>
> Initial commit of updated gstreamer + plugins which compile
>
> Signed-off-by: Bogdan Radulescu <bogdan@nimblex.net>
Some environments are not yet gst-1.0-ready, especially for network streaming.
Wouldn't it be useful, at least for some time, to have the choice between 0.10,
1.0, or both (they can be installed side by side without any conflict)?
Best regards,
Beno?t
^ permalink raw reply
* [Buildroot] [PATCH 1/4] libglib2: bumped version to 2.32.4
From: Benoît Thébaudeau @ 2012-12-19 16:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355936324-9585-1-git-send-email-bogdan@nimblex.org>
Dear Bogdan, Sven,
On Wednesday, December 19, 2012 5:58:41 PM, bogdan at nimblex.org wrote:
> From: Sven Neumann <s.neumann@raumfeld.com>
>
> Bump libglib2 to a newer stable version.
>
> There are a few changes to the configure options necessary
> in order to make it compile cleanly and work correctly.
> The patch has been tested on ARM and i486. Some things
> might have to be adjusted for other platforms.
>
> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
[--snip--]
> diff --git a/package/libglib2/libglib2.mk
> b/package/libglib2/libglib2.mk
> index c3e510b..b476200 100644
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -3,8 +3,9 @@
> # libglib2
> #
> #############################################################
> -LIBGLIB2_VERSION_MAJOR = 2.30
> -LIBGLIB2_VERSION_MINOR = 3
> +
> +LIBGLIB2_VERSION_MAJOR = 2.32
> +LIBGLIB2_VERSION_MINOR = 4
> LIBGLIB2_VERSION =
> $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
> LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
> LIBGLIB2_SITE =
> http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
> @@ -13,6 +14,7 @@ LIBGLIB2_INSTALL_STAGING = YES
> LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR)
> LDFLAGS=-L$(STAGING_DIR)/usr/lib install
>
> LIBGLIB2_CONF_ENV = \
> + CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \
> ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
> glib_cv_uscore=no ac_cv_func_strtod=yes \
> ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
> @@ -40,8 +42,10 @@ LIBGLIB2_CONF_ENV = \
> ac_cv_func_working_mktime=yes
> jm_cv_func_working_re_compile_pattern=yes \
> ac_use_included_regex=no gl_cv_c_restrict=no \
> ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal
> ac_cv_prog_F77=no \
> - ac_cv_func_posix_getgrgid_r=no glib_cv_long_long_format=ll \
> - ac_cv_func_printf_unix98=yes ac_cv_func_vsnprintf_c99=yes \
Can you explain in detail why you removed these? Did you test that gst-inspect
still works fine after that?
> + ac_cv_func_posix_getgrgid_r=no \
> + ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=8
> ac_cv_alignof_unsigned_long=4 \
> + ac_cv_func_newlocale=no ac_cv_func_uselocale=no \
> + ac_cv_func_strtod_l=no ac_cv_func_strtoll_l=no
> ac_cv_func_strtoull_l=no \
> gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
>
> # old uClibc versions don't provide qsort_r
> @@ -54,9 +58,6 @@ endif
> HOST_LIBGLIB2_CONF_OPT = \
> --disable-gtk-doc \
> --enable-debug=no \
> - --disable-dtrace \
> - --disable-systemtap \
> - --disable-gcov
Why? According to the help message, these options seem to be disabled by
default, but looking at the configure script, they rather seem to be auto if
unset.
Best regards,
Beno?t
^ permalink raw reply
* [Buildroot] [PATCH 2/4] gstreamer: port to gstreamer-1.0
From: Bogdan Radulescu @ 2012-12-19 15:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87d2y63zw3.fsf@dell.be.48ers.dk>
Sorry guys,
Yeah I've send to the wrong list.
gstreamer-1.0 has a slightly different API so it's not always a drop in
replacement.
I will send to the correct list and continue discussions there.
Bogdan
On Wed, Dec 19, 2012 at 2:00 PM, Peter Korsgaard <jacmet@sunsite.dk> wrote:
> >>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
>
> Hi,
>
> Arnout> OTOH, it's probably not needed to have them side-by-side, so it's
> Arnout> probably sufficient to have a config option in
> BR2_PACKAGE_GSTREAMER
> Arnout> to differentiate the two.
>
> True - If that doesn't complicate the .mk / Config.in too much.
>
> Arnout> I didn't see the original patches, so I can't say if it's easier
> to
> Arnout> have them side-by-side or within a single package...
>
> It was accidentially sent to the busybox list instead. I've asked Bodgan
> to resend the series to the buildroot list.
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121219/e0069025/attachment-0001.html>
^ permalink raw reply
* [Buildroot] RFS for Raspberry Pi
From: Zoran Djordjevic @ 2012-12-19 14:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <98ED3619EA864D3CBD8065366C586233@JohanW7>
OK, thank's, I am going to try something in January and will inform if
something interesting happend.
?
Regards
________________________________
From: Sagaert Johan <sagaert.johan@skynet.be>
To: 'Zoran Djordjevic' <djdjdjole@yahoo.com>
Sent: Wednesday, December 19, 2012 2:22 PM
Subject: RE: [Buildroot] RFS for Raspberry Pi
Hi Zoran
?
Sorry for the late response ..
?
I did
not try it with another kernel, i am not sure but i assume it wil be apthed
version to support the broadcom specific peripherals.
?
QT4.8
is in the packages as well as the QT5rc? now.
?
I
always use the internal toolchain for my projects.
I did
the raspberry build once for the fun of it...,no real plans with it for the
moment...
?
Regards, Johan
?
________________________________
Van: buildroot-bounces at busybox.net
[mailto:buildroot-bounces at busybox.net] Namens Zoran
Djordjevic
Verzonden: zondag 16 december 2012 16:31
Aan: Sagaert Johan
CC: buildroot at busybox.net
Onderwerp: Re:
[Buildroot] RFS for Raspberry Pi
Thank you Johan. At first
glance, I think kernel is also included in this git. But I hope I am free,
as
I used?to, to?pull some other kernel ? Also, can I
use makeconfig to build RFS with Crosstool-Ng
and glibc (instead of uclibc), which suits me more ? Or what if I?prefer
GTK or??Qt4?
And one general question
(already asked in previous mail) - can I simply use the same BuildRoot, that I
installed when building RFS (not kernel)?for my mini2440, because I think
it doesn't matter the board type ??
?
Regards Zoran
________________________________
From: Sagaert Johan
<sagaert.johan@skynet.be>
To: 'Zoran Djordjevic'
<djdjdjole@yahoo.com>
Sent: Sunday, December 16, 2012 3:13
PM
Subject: RE: [Buildroot] RFS
for Raspberry Pi
Hi Zoran
?
You need te pull this git::?
git://github.com/nezticle/RaspberryPi-BuildRoot.git
?
https://github.com/nezticle/RaspberryPi-BuildRoot
?
It builds just fine and even contains
QT5
?
Regards, Johan
________________________________
Van: buildroot-bounces at busybox.net
[mailto:buildroot-bounces at busybox.net] Namens Zoran
Djordjevic
Verzonden: zondag 16 december 2012 14:39
Aan: buildroot at busybox.net
Onderwerp: [Buildroot] RFS for Raspberry
Pi
Recently I acquired new ARM based board -Raspberry Pi, and first I tried to
inform myself about using Buildroot to build kernel and RFS, (u-boot ?).
Earlier, I successfully built kernel and RFS for my mini2440 board, using
Buildroot.?I found some discussion at:
http://superuser.com/questions/473067/is-there-a-linux-distro-that-will-easily-run-embedded-style-on-a-raspberry-pi
which states that Buidroot, yet has no?complete support for it.
I thaught that Buildroot doesn't care about particular board, if I have
kernel source for?it so?hope that?someone will?explain me
that matter (and also what about Raspberry Pi).
Regards
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121219/ee8291bd/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH] libcap: disable programs
From: Peter Korsgaard @ 2012-12-19 14:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355150584-31592-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Disable libcap programs since they use fork and fail on !MMU systems.
Gustavo> They're not usually used, if someone wants them they can add
Gustavo> an option.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] libcap: disable programs
From: Peter Korsgaard @ 2012-12-19 14:12 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=c4c914552e4fba8139e74d90a26bbba5048d6492
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Disable libcap programs since they use fork and fail on !MMU systems.
They're not usually used, if someone wants them they can add an option.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/libcap/libcap.mk | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index b922e5a..94a0cbb 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -25,9 +25,15 @@ endef
define LIBCAP_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \
prefix=/usr lib=lib install
- rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps)
endef
+# progs use fork()
+define LIBCAP_DISABLE_PROGS
+ $(SED) '/-C progs/d' $(@D)/Makefile
+endef
+
+LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS
+
define HOST_LIBCAP_BUILD_CMDS
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
endef
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] gstreamer: port to gstreamer-1.0
From: Peter Korsgaard @ 2012-12-19 14:00 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50D1BE2D.8060507@mind.be>
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
Hi,
Arnout> OTOH, it's probably not needed to have them side-by-side, so it's
Arnout> probably sufficient to have a config option in BR2_PACKAGE_GSTREAMER
Arnout> to differentiate the two.
True - If that doesn't complicate the .mk / Config.in too much.
Arnout> I didn't see the original patches, so I can't say if it's easier to
Arnout> have them side-by-side or within a single package...
It was accidentially sent to the busybox list instead. I've asked Bodgan
to resend the series to the buildroot list.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 2/3] pcmanfm: use a download URL from downloads.sourceforge.net
From: Thomas Petazzoni @ 2012-12-19 13:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87hani4090.fsf@dell.be.48ers.dk>
Dear Peter Korsgaard,
On Wed, 19 Dec 2012 14:52:59 +0100, Peter Korsgaard wrote:
> I changed this to use PCMANFM_VERSION instead of hardcoding 0.3.5.9 here
> and committed all 3, thanks.
Indeed, thanks.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 2/3] pcmanfm: use a download URL from downloads.sourceforge.net
From: Peter Korsgaard @ 2012-12-19 13:52 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355908403-27224-2-git-send-email-thomas.petazzoni@free-electrons.com>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> package/pcmanfm/pcmanfm.mk | 2 +-
Thomas> 1 file changed, 1 insertion(+), 1 deletion(-)
Thomas> diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
Thomas> index e4c23ec..8eaa485 100644
Thomas> --- a/package/pcmanfm/pcmanfm.mk
Thomas> +++ b/package/pcmanfm/pcmanfm.mk
Thomas> @@ -5,7 +5,7 @@
Thomas> #############################################################
Thomas> PCMANFM_VERSION = 0.3.5.9
Thomas> PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
Thomas> -PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
Thomas> +PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%200.3.5.9/
I changed this to use PCMANFM_VERSION instead of hardcoding 0.3.5.9 here
and committed all 3, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] pcmanfm: replace dependency on X.org server by dependency on libX11
From: Peter Korsgaard @ 2012-12-19 13:52 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=043ba78869b09da6f1bfa0daaa66fc0960163371
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
There is no reason for a client program like pcmanfm to depend on the
X.org server. Instead, it should depend on the appropriate X
client libraries, in this case libX11.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/pcmanfm/Config.in | 1 +
package/pcmanfm/pcmanfm.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index c8b4deb..484192b 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_PCMANFM
depends on BR2_USE_WCHAR # glib2
select BR2_PACKAGE_GAMIN
select BR2_PACKAGE_STARTUP_NOTIFICATION
+ select BR2_PACKAGE_XLIB_LIBX11
depends on BR2_PACKAGE_LIBGTK2
help
An extremly fast and lightweight file manager which features
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 3b0b727..392e3ad 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -7,7 +7,7 @@ PCMANFM_VERSION = 0.3.5.9
PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
PCMANFM_CONF_OPT = --disable-hal
-PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX11
PCMANFM_AUTORECONF = YES
$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [PATCH] orc: bump to version 0.4.16
From: Sven Neumann @ 2012-12-19 13:51 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87licu40ie.fsf@dell.be.48ers.dk>
On Wed, 2012-12-19 at 14:47 +0100, Peter Korsgaard wrote:
> >>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:
>
> Sven> The gstreamer-1.0 plug-ins require this version for ORC
> Sven> acceleration.
>
> Committed, thanks. This presumably also works with gst 0.10?
Yes. I've also tried (compiled) it with gstreamer-0.10.
Regards,
Sven
^ permalink raw reply
* [Buildroot] [git commit] pcmanfm: use a download URL from downloads.sourceforge.net
From: Peter Korsgaard @ 2012-12-19 13:50 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fff080bdfa7f6a8f18c8b8f7d0d26035b7438e80
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: use PCMANFM_VERSION in _SITE]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/pcmanfm/pcmanfm.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index e4c23ec..3b0b727 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -5,7 +5,7 @@
#############################################################
PCMANFM_VERSION = 0.3.5.9
PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
-PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
+PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
PCMANFM_CONF_OPT = --disable-hal
PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
PCMANFM_AUTORECONF = YES
^ permalink raw reply related
* [Buildroot] [git commit] pcmanfm: link against libX11 to avoid build failure
From: Peter Korsgaard @ 2012-12-19 13:49 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a831505a3d32ef8839b7a12eee4b91ad594779ac
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes:
/home/test/outputs/allpkg/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/4.7.3/../../../../arm-linux-gnueabihf/bin/ld: fm-desktop.o: undefined reference to symbol 'XSendEvent'
/home/test/outputs/allpkg/host/opt/ext-toolchain/bin/../lib/gcc/arm-linux-gnueabihf/4.7.3/../../../../arm-linux-gnueabihf/bin/ld: note: 'XSendEvent' is defined in DSO /home/test/outputs/allpkg/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libX11.so.6 so try adding it to the linker command line
/home/test/outputs/allpkg/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libX11.so.6: could not read symbols: Invalid operation
collect2: error: ld returned 1 exit status
make[4]: *** [pcmanfm] Error 1
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/pcmanfm/pcmanfm-link-against-libx11.patch | 20 ++++++++++++++++++++
package/pcmanfm/pcmanfm.mk | 1 +
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/package/pcmanfm/pcmanfm-link-against-libx11.patch b/package/pcmanfm/pcmanfm-link-against-libx11.patch
new file mode 100644
index 0000000..f571e77
--- /dev/null
+++ b/package/pcmanfm/pcmanfm-link-against-libx11.patch
@@ -0,0 +1,20 @@
+Link against libX11
+
+fm-desktop.c uses XSendEvent, so we should link against libX11.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -12,7 +12,8 @@
+
+ pkg_modules="gtk+-2.0 >= 2.6.0 \
+ gthread-2.0 \
+- libstartup-notification-1.0"
++ libstartup-notification-1.0 \
++ x11"
+
+ AC_FUNC_MMAP
+
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index 1f1a330..e4c23ec 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -8,6 +8,7 @@ PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.gz
PCMANFM_SITE = http://internap.dl.sourceforge.net/sourceforge/pcmanfm
PCMANFM_CONF_OPT = --disable-hal
PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xserver_xorg-server
+PCMANFM_AUTORECONF = YES
$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [PATCH] orc: bump to version 0.4.16
From: Peter Korsgaard @ 2012-12-19 13:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355914471-18864-1-git-send-email-s.neumann@raumfeld.com>
>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:
Sven> The gstreamer-1.0 plug-ins require this version for ORC
Sven> acceleration.
Committed, thanks. This presumably also works with gst 0.10?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] orc: bump to version 0.4.16
From: Peter Korsgaard @ 2012-12-19 13:47 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=e51fd21cc4e58d6f9b8baad6e5d4a922b4e5841a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The gstreamer-1.0 plug-ins require this version for ORC
acceleration.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/orc/orc.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 842ef25..77cb29f 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -3,7 +3,7 @@
# orc
#
#############################################################
-ORC_VERSION = 0.4.14
+ORC_VERSION = 0.4.16
ORC_SITE = http://code.entropywave.com/download/orc/
ORC_INSTALL_STAGING = YES
ORC_DEPENDENCIES = host-orc
^ permalink raw reply related
* [Buildroot] [PATCH] ortp: disable Werror
From: Peter Korsgaard @ 2012-12-19 13:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355922447-20410-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Disable -Werror for the ortp build, fixes:
Gustavo> http://autobuild.buildroot.net/results/b869fcfdfdb9d1ec4864b86c6953b0242200c502
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] ortp: disable Werror
From: Peter Korsgaard @ 2012-12-19 13:45 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=356c2d7d843f7faa78c9ace79f17b0d947c9435b
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Disable -Werror for the ortp build, fixes:
http://autobuild.buildroot.net/results/b869fcfdfdb9d1ec4864b86c6953b0242200c502
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/ortp/ortp.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index 65a03bf..c4c900a 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -1,5 +1,6 @@
ORTP_VERSION = 0.20.0
ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
+ORTP_CONF_OPT = --disable-strict
ORTP_INSTALL_STAGING = YES
$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] Bug report in pkg-autotools.mk
From: Yvan Roch @ 2012-12-19 13:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121219133507.058bf1ea@skate>
Hi Thomas,
Many thanks for your quick answer.
I will not use a /usr* path until you publish your general patch for .la files.
There are several other .la files with paths pointing to the build directory.
For example: libdirect.la, libfusion.la, libuuid.la, libblkid.la, libpcre.la
But it's not exhaustive, it's in my own build...
Regards,
Yvan.
^ permalink raw reply
* [Buildroot] [PATCH] package/uboot-tools: Add mkenvimage for host.
From: Thomas Petazzoni @ 2012-12-19 13:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50D1BB1D.3090907@syscom.ch>
Dear Arnaud R?billout,
On Wed, 19 Dec 2012 14:03:25 +0100, Arnaud R?billout wrote:
> > *) Could you send a proper git patch, with a description,
> > Signed-off-by line, and sent using git send-email so that it doesn't
> > get line-wrapped by your mail client.
> Ok I will look at that and do my best.
No problem. If you need help, don't hesitate to ask. Basically, your
mail should look like:
==================================================================
u-boot: add support for mkenvimage installation and usage
U-Boot has an utility called mkenvimage that allows blablabla. This
commit installs this utility and provides configuration options for
blablabla.
Signed-off-by: Arnaud R?billout <rebillout@syscom.ch>
---
<the patch goes here>
==================================================================
This gets done automatically by Git as long as you provide the text
above as the commit log.
> > *) I would like to see an option being added in the U-Boot
> > configuration options to pass a txt file containing an environment
> > definition, which would be passed through mkenvimage to generate an
> > image environment, and then installed in $(BINARIES_DIR). Could you
> > cook such a patch, or do you prefer if someone else does it?
> Sounds good to me, I will send you a new patch. Hopefully before the end
> of the week.
Excellent, thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 2/4] gstreamer: port to gstreamer-1.0
From: Peter Korsgaard @ 2012-12-19 13:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355916156-17973-2-git-send-email-bogdan@nimblex.org>
>>>>> "bogdan" == bogdan <bogdan@nimblex.org> writes:
bogdan> From: Bogdan Radulescu <bogdan@nimblex.net>
bogdan> Initial commit of updated gstreamer + plugins which compile
Oh and btw - You're on the wrong mailing list ;)
Could you please resend the series to buildroot at uclibc.org - Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox