* [Buildroot] [PATCH RFC 1/6] imx-lib: new package
From: Arnout Vandecappelle @ 2012-12-19 23:37 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355960256-10786-1-git-send-email-arnout@mind.be>
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/Config.in | 1 +
package/imx-lib/Config.in | 53 ++++++++++++++++++++++++++++++++++++++++++++
package/imx-lib/imx-lib.mk | 41 ++++++++++++++++++++++++++++++++++
3 files changed, 95 insertions(+)
create mode 100644 package/imx-lib/Config.in
create mode 100644 package/imx-lib/imx-lib.mk
diff --git a/package/Config.in b/package/Config.in
index 66445ff..def4b20 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -421,6 +421,7 @@ endmenu
menu "Hardware handling"
source "package/ccid/Config.in"
+source "package/imx-lib/Config.in"
source "package/lcdapi/Config.in"
source "package/libaio/Config.in"
source "package/libraw1394/Config.in"
diff --git a/package/imx-lib/Config.in b/package/imx-lib/Config.in
new file mode 100644
index 0000000..1617009
--- /dev/null
+++ b/package/imx-lib/Config.in
@@ -0,0 +1,53 @@
+comment "imx-lib needs an imx-specific kernel to be built"
+ depends on BR2_arm && !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_IMX_LIB
+ bool "imx-lib"
+ depends on BR2_LINUX_KERNEL
+ depends on BR2_arm # Only relevant for i.MX
+ help
+ Library of userspace helpers specific for the Freescale i.MX
+ platform. It wraps the kernel interfaces for some i.MX platform
+ specific drivers. It requires a kernel that includes the i.MX
+ specific headers to be built.
+
+ This library is provided by Freescale as-is and doesn't have
+ an upstream.
+
+if BR2_PACKAGE_IMX_LIB
+choice
+ prompt "i.MX platform"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+ bool "imx25-3stack"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+ bool "imx27ads"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+ bool "imx37-3stack"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+ bool "imx50"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+ bool "imx51"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+ bool "imx53"
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+ bool "imx6q"
+
+endchoice
+
+config BR2_PACKAGE_IMX_LIB_PLATFORM
+ string
+ default "IMX25_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
+ default "IMX27ADS" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
+ default "IMX37_3STACK" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
+ default "IMX50" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
+ default "IMX51" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
+ default "IMX53" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
+ default "IMX6Q" if BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
+endif
diff --git a/package/imx-lib/imx-lib.mk b/package/imx-lib/imx-lib.mk
new file mode 100644
index 0000000..c168c80
--- /dev/null
+++ b/package/imx-lib/imx-lib.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# imx-lib
+#
+#############################################################
+
+IMX_LIB_VERSION = 12.09.01
+# No official download site from freescale, just this mirror
+IMX_LIB_SITE = http://download.ossystems.com.br/bsp/freescale/source
+IMX_LIB_LICENSE = LGPLv2.1+
+# No license file included
+
+IMX_LIB_INSTALL_STAGING = YES
+
+# imx-lib needs access to imx-specific kernel headers
+IMX_LIB_DEPENDENCIES += linux
+IMX_LIB_INCLUDE = \
+ -I$(LINUX_DIR)/drivers/mxc/security/rng/include \
+ -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
+ -idirafter $(LINUX_DIR)/include
+
+IMX_LIB_MAKE_ENV = \
+ $(TARGET_MAKE_ENV) \
+ $(TARGET_CONFIGURE_OPTS) \
+ CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \
+ INCLUDE="$(IMX_LIB_INCLUDE)"
+
+define IMX_LIB_BUILD_CMDS
+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define IMX_LIB_INSTALL_STAGING_CMDS
+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install
+endef
+
+define IMX_LIB_INSTALL_TARGET_CMDS
+ $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH RFC 0/6] Freescale i.MX multimedia libraries
From: Arnout Vandecappelle @ 2012-12-19 23:37 UTC (permalink / raw)
To: buildroot
This patch series adds Freescale's proprietary multimedia libraries for
the i.MX platform.
I only tested it on mx6q (SabreLite). I'm sending it now even though there
are still a few major shortcomings, so Peter (and others) have the chance
to test it on different platforms while I'm on vacation.
These are the things I'd like to see improved - feedback is very welcome!
* The platform stuff. A separate choice in imx-lib and gst-fsl-plugins
really doesn't work, because they are not kept consistent (the 'select'
doesn't always work).
* The binary libraries are linked against glibc, so there probably
should be a dependency on glibc/eglibc as well. However, for
gst-fsl-plugins, not everything depends on the binary libraries.
For instance, the VPU encoder/decoder only requires a firmware blob.
Unfortunately, it still didn't work with uClibc (didn't spend much time
on it though).
* All the binary libraries are installed, even though they are for
other platforms. The whole thing is about 10MB.
* I couldn't find an official upstream download site, so I used a mirror,
but it risks disappearing unexpectedly.
* More stuff should be selectable (e.g. which gst plugins to build).
The extraction of the .bin self-extractors if fortunately just slightly
messy :-) The legal-info on the other hand is horrible - as usual,
the proprietary projects are much less conscientious about legal stuff
and the typical open source project...
For the platform stuff, one idea I had was to create a new menu for
platform-specific packages. In that menu, you'd have a menuconfig per
platform, and this menu could give a SoC choice. The platform-specific
menus can collect all the platform-specific packages which are now
"polluting" the rest of the menus. For example:
menu "Platform-specific packages"
menuconfig "Freescale i.MX"
choice "i.MX SoC"
config "i.MX 51"
config "i.MX 6"
endchoice
menuconfig "Freescale QorIQ"
menuconfig "Raspberry Pi"
menuconfig "Snowball"
source "package/snowball-hdmiservice"
source "package/snowball-init"
menuconfig "TI Davinci"
How does this sound?
Regards,
Arnout
^ permalink raw reply
* [Buildroot] [PATCH] toolchain-crosstool-ng: update PPL and CLoog versions in default configs
From: Thomas Petazzoni @ 2012-12-19 23:29 UTC (permalink / raw)
To: buildroot
We have updated our Crosstool-NG configuration to gcc 4.6.x, but the
PPL and CLoog versions were not updated accordingly. With gcc 4.6.x,
at least PPL 0.11 is needed, and only CLoog > 0.15.9 can work with PLL
0.11.
Fixes:
http://autobuild.buildroot.org/results/c22758a30c3b8abb582150cefd7099605c527e14/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../crosstool-ng.config-eglibc | 16 ++++++++++------
.../crosstool-ng.config-glibc | 16 ++++++++++------
.../crosstool-ng.config-uClibc | 16 ++++++++++------
3 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 11eb602..08f036c 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -474,18 +474,22 @@ CT_MPFR_V_2_4_2=y
# CT_MPFR_V_2_4_1 is not set
# CT_MPFR_V_2_4_0 is not set
CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
+CT_PPL_V_0_11_2=y
# CT_PPL_V_0_11_1 is not set
# CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-# CT_CLOOG_V_0_15_11 is not set
+# CT_PPL_V_0_10_2 is not set
+CT_PPL_VERSION="0.11.2"
+CT_PPL_0_11=y
+CT_PPL_NEEDS_LIBPWL=y
+CT_CLOOG_V_0_15_11=y
# CT_CLOOG_V_0_15_10 is not set
-CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_9 is not set
# CT_CLOOG_V_0_15_8 is not set
# CT_CLOOG_V_0_15_7 is not set
# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.9"
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
CT_MPC_V_0_9=y
# CT_MPC_V_0_8_2 is not set
# CT_MPC_V_0_8_1 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index c30a115..ae0bc02 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -463,18 +463,22 @@ CT_MPFR_V_2_4_2=y
# CT_MPFR_V_2_4_1 is not set
# CT_MPFR_V_2_4_0 is not set
CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
+CT_PPL_V_0_11_2=y
# CT_PPL_V_0_11_1 is not set
# CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-# CT_CLOOG_V_0_15_11 is not set
+# CT_PPL_V_0_10_2 is not set
+CT_PPL_VERSION="0.11.2"
+CT_PPL_0_11=y
+CT_PPL_NEEDS_LIBPWL=y
+CT_CLOOG_V_0_15_11=y
# CT_CLOOG_V_0_15_10 is not set
-CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_9 is not set
# CT_CLOOG_V_0_15_8 is not set
# CT_CLOOG_V_0_15_7 is not set
# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.9"
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
CT_MPC_V_0_9=y
# CT_MPC_V_0_8_2 is not set
# CT_MPC_V_0_8_1 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index e93128b..4f21263 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -445,18 +445,22 @@ CT_MPFR_V_2_4_2=y
# CT_MPFR_V_2_4_1 is not set
# CT_MPFR_V_2_4_0 is not set
CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
+CT_PPL_V_0_11_2=y
# CT_PPL_V_0_11_1 is not set
# CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-# CT_CLOOG_V_0_15_11 is not set
+# CT_PPL_V_0_10_2 is not set
+CT_PPL_VERSION="0.11.2"
+CT_PPL_0_11=y
+CT_PPL_NEEDS_LIBPWL=y
+CT_CLOOG_V_0_15_11=y
# CT_CLOOG_V_0_15_10 is not set
-CT_CLOOG_V_0_15_9=y
+# CT_CLOOG_V_0_15_9 is not set
# CT_CLOOG_V_0_15_8 is not set
# CT_CLOOG_V_0_15_7 is not set
# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.9"
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
CT_MPC_V_0_9=y
# CT_MPC_V_0_8_2 is not set
# CT_MPC_V_0_8_1 is not set
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH] mplayer: prevent selection on Microblaze and AArch64
From: Thomas Petazzoni @ 2012-12-19 23:27 UTC (permalink / raw)
To: buildroot
MPlayer wants to have some "support" for each architecture, and for
now, it doesn't know about Microblaze and AArch64, so prevent the
selection of MPlayer on those architectures.
For Microblaze, fixes:
http://autobuild.buildroot.org/results/4e6e0d15694345ded649c92251cc2173dc45fe7c/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
For AArch64, there was also a build failure raised by the autobuilders
some days ago, but I can't find it anymore.
---
package/multimedia/mplayer/Config.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/multimedia/mplayer/Config.in b/package/multimedia/mplayer/Config.in
index c64dab7..e285644 100644
--- a/package/multimedia/mplayer/Config.in
+++ b/package/multimedia/mplayer/Config.in
@@ -1,8 +1,7 @@
config BR2_PACKAGE_MPLAYER
bool "mplayer"
- # "Error: unsupported architecture sh4a" says mplayer
- # configure script.
- depends on !BR2_sh4a && !BR2_sh4aeb
+ # Those architectures are not supported by MPlayer
+ depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64
depends on BR2_LARGEFILE
help
MPlayer is a movie player which runs on many systems and supports
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH] Add a config override file capability.
From: Charles Manning @ 2012-12-19 23:25 UTC (permalink / raw)
To: buildroot
This is similar to the package override capability and allows the overriding
of configuration symbols without modifying .config.
Why? Same reason as having package overriding...
Examples:
1) Might need to override svn on a user-by-user basis to add --username
2) Might want to be able to set versions of code fetched from svn without
changing the .config. Just put the overriding symbols in the override file.
The override file is included straight after .config in the Makefile, so
this limits what should be done there...
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---
Config.in | 7 +++++++
Makefile | 9 +++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/Config.in b/Config.in
index b319ac7..9f42a26 100644
--- a/Config.in
+++ b/Config.in
@@ -419,6 +419,13 @@ config BR2_PACKAGE_OVERRIDE_FILE
as the source directory for a particular package. See the
Buildroot documentation for more details on this feature.
+config BR2_CONFIG_OVERRIDE_FILE
+ string "location of a configuration override file"
+ help
+ A configuration override file is a short makefile that contains
+ variable definitions of the form BR2_xxx to override configurations
+ in the .config configuration file.
+
endmenu
source "toolchain/Config.in"
diff --git a/Makefile b/Makefile
index 4b09437..d133a27 100644
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,15 @@ endif
# Pull in the user's configuration file
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include $(CONFIG_DIR)/.config
+
+# Include the config override file if one has been provided in the
+# configuration.
+CONFIG_OVERRIDE_FILE=$(call qstrip,$(BR2_CONFIG_OVERRIDE_FILE))
+ifneq ($(CONFIG_OVERRIDE_FILE),)
+$(warning Overriding configuration with $(CONFIG_OVERRIDE_FILE))
+include $(CONFIG_OVERRIDE_FILE)
+endif
+
endif
# To put more focus on warnings, be less verbose as default
--
1.7.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] valgrind: bump to 3.8.1
From: Thomas Petazzoni @ 2012-12-19 23:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355958895-13294-1-git-send-email-thomas.petazzoni@free-electrons.com>
Status of the patches:
* valgrind-compiler-check.patch, no longer needed, merged upstream.
* valgrind-dont-include-a-out-header.patch, kept, just refreshed
* valgrind-fix-ccache-support.patch, adapted to the newer Valgrind
release.
* valgrind-largefile.patch, kept, just refreshed
* valgrind-more-ioctls.patch, removed. Most of it was merged
upstream. This patch was anyway a feature addition, so it shouldn't
be kept in Buildroot.
* valgrind-workaround-SIGSEGV-on-PPC.patch, kept as is, just
refreshed.
This bump also fixes the build failure we were experiencing with
Valgrind 3.7.0 against recent Glibc versions.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/valgrind/valgrind-compiler-check.patch | 76 --------
| 2 +-
package/valgrind/valgrind-fix-ccache-support.patch | 54 +++---
package/valgrind/valgrind-largefile.patch | 20 +-
package/valgrind/valgrind-more-ioctls.patch | 203 --------------------
.../valgrind-workaround-SIGSEGV-on-PPC.patch | 6 +-
package/valgrind/valgrind.mk | 2 +-
7 files changed, 41 insertions(+), 322 deletions(-)
delete mode 100644 package/valgrind/valgrind-compiler-check.patch
delete mode 100644 package/valgrind/valgrind-more-ioctls.patch
diff --git a/package/valgrind/valgrind-compiler-check.patch b/package/valgrind/valgrind-compiler-check.patch
deleted file mode 100644
index 4a9fcba..0000000
--- a/package/valgrind/valgrind-compiler-check.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Fix the compiler version check so that it doesn't misdetect the
-version when the compiler version contains parenthesis.
-
-Taken from upstream r12274.
-
-Index: valgrind-3.7.0/configure.in
-===================================================================
---- valgrind-3.7.0.orig/configure.in 2011-12-22 15:21:22.269669307 +0100
-+++ valgrind-3.7.0/configure.in 2011-12-22 15:21:54.029135051 +0100
-@@ -98,18 +98,21 @@
- # We don't want gcc < 3.0
- AC_MSG_CHECKING([for a supported version of gcc])
-
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
- #
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# A few examples of how the ${CC} --version output looks like:
-+#
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
- #
- [gcc_version=`${CC} --version \
-- | head -n 1 \
-- | $SED 's/i686-apple-darwin10//' \
-- | $SED 's/i686-apple-darwin11//' \
-- | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+ | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+ -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
-
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
-Index: valgrind-3.7.0/configure
-===================================================================
---- valgrind-3.7.0.orig/configure 2011-12-22 15:22:05.138948143 +0100
-+++ valgrind-3.7.0/configure 2011-12-22 15:23:34.807439246 +0100
-@@ -5122,18 +5122,22 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a supported version of gcc" >&5
- $as_echo_n "checking for a supported version of gcc... " >&6; }
-
--# Try to get the gcc version, sed-ing out some unexpected stuff
--# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
--# Without this, the version number comes out as 686, 10 or 11 :-(
-+# Obtain the compiler version.
-+#
-+# A few examples of how the ${CC} --version output looks like:
- #
--# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
--# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
-+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
-+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
-+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
-+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
-+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
-+# Clang: clang version 2.9 (tags/RELEASE_29/final)
- #
- gcc_version=`${CC} --version \
-- | head -n 1 \
-- | $SED 's/i686-apple-darwin10//' \
-- | $SED 's/i686-apple-darwin11//' \
-- | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`
-+ | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
-+ -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`
-+
-
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/package/valgrind/valgrind-dont-include-a-out-header.patch b/package/valgrind/valgrind-dont-include-a-out-header.patch
index ed1c939..2afd44a 100644
--- a/package/valgrind/valgrind-dont-include-a-out-header.patch
+++ b/package/valgrind/valgrind-dont-include-a-out-header.patch
@@ -20,7 +20,7 @@ Index: b/coregrind/m_debuginfo/readstabs.c
===================================================================
--- a/coregrind/m_debuginfo/readstabs.c
+++ b/coregrind/m_debuginfo/readstabs.c
-@@ -52,7 +52,21 @@
+@@ -53,7 +53,21 @@
/* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
#if defined(VGO_linux)
diff --git a/package/valgrind/valgrind-fix-ccache-support.patch b/package/valgrind/valgrind-fix-ccache-support.patch
index 56d984b..40ada8d 100644
--- a/package/valgrind/valgrind-fix-ccache-support.patch
+++ b/package/valgrind/valgrind-fix-ccache-support.patch
@@ -11,41 +11,39 @@ is:
/path/to/ccache /path/to/crossgcc -o foobar foobar.c -someflags
-Since this Perl script simply needs to add additional flags to the
-command line, we simply add them at the end of the command line
-instead of trying to add them at the beginning.
+Therefore, we tune the script to take into account the case where
+ccache is used.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: valgrind-3.6.1/coregrind/link_tool_exe_linux.in
+Index: b/coregrind/link_tool_exe_linux.in
===================================================================
---- valgrind-3.6.1.orig/coregrind/link_tool_exe_linux.in 2011-12-22 13:59:08.933499060 +0100
-+++ valgrind-3.6.1/coregrind/link_tool_exe_linux.in 2011-12-22 13:59:50.302782709 +0100
-@@ -55,25 +55,13 @@
- if (($#ARGV + 1) < 5);
-
- my $ala = $ARGV[0];
-+shift;
-
- # check for plausible-ish alt load address
+--- a/coregrind/link_tool_exe_linux.in
++++ b/coregrind/link_tool_exe_linux.in
+@@ -60,8 +60,16 @@
die "Bogus alt-load address"
if (length($ala) < 3 || index($ala, "0x") != 0);
--# The cc invokation to do the final link
++shift(@ARGV);
++
++if ($ARGV[0] =~ /.*ccache/) {
++ shift(@ARGV);
++}
++
+ # The cc invokation to do the final link
-my $cc = $ARGV[1];
--
--# and the 'restargs' are argv[2 ..]
--
--# so, build up the complete command here:
--# 'cc' -static -Ttext='ala' 'restargs'
--
--my $cmd="$cc -static -Wl,-Ttext=$ala";
--
--# Add the rest of the parameters
--foreach my $n (2 .. $#ARGV) {
-- $cmd = "$cmd $ARGV[$n]";
--}
-+my $cmd=join(" ", @ARGV) . " -static -Wl,-Ttext=$ala";
++my $cc = $ARGV[0];
++
++shift(@ARGV);
- #print "link_tool_exe_linux: $cmd\n";
+ # and the 'restargs' are argv[2 ..]
+
+@@ -82,7 +90,7 @@
+ }
+
+ # Add the rest of the parameters
+-foreach my $n (2 .. $#ARGV) {
++foreach my $n (0 .. $#ARGV) {
+ $cmd = "$cmd $ARGV[$n]";
+ }
diff --git a/package/valgrind/valgrind-largefile.patch b/package/valgrind/valgrind-largefile.patch
index 53b6e6f..3a8a780 100644
--- a/package/valgrind/valgrind-largefile.patch
+++ b/package/valgrind/valgrind-largefile.patch
@@ -6,10 +6,10 @@ is detected.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
+Index: b/coregrind/m_initimg/initimg-linux.c
===================================================================
---- valgrind-3.7.0.orig/coregrind/m_initimg/initimg-linux.c 2011-10-26 23:24:43.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c 2011-12-22 14:53:12.798185055 +0100
+--- a/coregrind/m_initimg/initimg-linux.c
++++ b/coregrind/m_initimg/initimg-linux.c
@@ -55,7 +55,11 @@
/* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
@@ -22,11 +22,11 @@ Index: valgrind-3.7.0/coregrind/m_initimg/initimg-linux.c
/* This is for ELF types etc, and also the AT_ constants. */
#include <elf.h>
/* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.7.0/coregrind/m_main.c
+Index: b/coregrind/m_main.c
===================================================================
---- valgrind-3.7.0.orig/coregrind/m_main.c 2011-10-26 23:24:45.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_main.c 2011-12-22 14:53:12.798185055 +0100
-@@ -2743,7 +2743,11 @@
+--- a/coregrind/m_main.c
++++ b/coregrind/m_main.c
+@@ -2948,7 +2948,11 @@
/* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
#define _GNU_SOURCE
@@ -38,10 +38,10 @@ Index: valgrind-3.7.0/coregrind/m_main.c
/* This is in order to get AT_NULL and AT_PAGESIZE. */
#include <elf.h>
/* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
-Index: valgrind-3.7.0/coregrind/m_ume/elf.c
+Index: b/coregrind/m_ume/elf.c
===================================================================
---- valgrind-3.7.0.orig/coregrind/m_ume/elf.c 2011-10-26 23:24:41.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_ume/elf.c 2011-12-22 14:53:12.798185055 +0100
+--- a/coregrind/m_ume/elf.c
++++ b/coregrind/m_ume/elf.c
@@ -48,7 +48,11 @@
/* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
diff --git a/package/valgrind/valgrind-more-ioctls.patch b/package/valgrind/valgrind-more-ioctls.patch
deleted file mode 100644
index fb58381..0000000
--- a/package/valgrind/valgrind-more-ioctls.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Add various ioctl()s
-
-Patch initially written by Eric Andersen <andersen@codepoet.org>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c
-===================================================================
---- valgrind-3.7.0.orig/coregrind/m_syswrap/syswrap-linux.c 2011-10-27 12:55:05.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c 2011-12-22 14:53:16.258126390 +0100
-@@ -4058,7 +4058,33 @@
- case VKI_SG_GET_SG_TABLESIZE: /* 0x227f */
- PRE_MEM_WRITE( "ioctl(SG_GET_SG_TABLESIZE)", ARG3, sizeof(int) );
- break;
-+ case VKI_SCSI_IOCTL_GET_IDLUN:
-+ PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_IDLUN)", ARG3, sizeof(vki_scsi_idlun_t) );
-+ break;
-+ case VKI_SCSI_IOCTL_PROBE_HOST:
-+ {
-+ int arraylen;
-+ char *array = (char*)ARG3;
-+ PRE_MEM_READ("ioctl(SCSI_IOCTL_PROBE_HOST)", ARG3, sizeof(char)*4 );
-+ arraylen = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24);
-+ PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_PROBE_HOST)", ARG3, sizeof(char)*arraylen );
-+ }
-+ break;
-+ case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
-+ PRE_MEM_WRITE( "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", ARG3, sizeof(int) );
-+ break;
-
-+ case VKI_FDRESET:
-+ break;
-+ case VKI_FDGETDRVTYP:
-+ PRE_MEM_WRITE( "ioctl(FDGETDRVTYP)", ARG3, sizeof(char)*16 );
-+ break;
-+ case VKI_FDPOLLDRVSTAT:
-+ PRE_MEM_WRITE( "ioctl(FDPOLLDRVSTAT)", ARG3, sizeof(vki_floppy_drive_struct_t) );
-+ break;
-+ case VKI_FDGETPRM:
-+ PRE_MEM_WRITE( "ioctl(FDGETPRM)", ARG3, sizeof(vki_floppy_struct_t) );
-+ break;
- case VKI_IIOCGETCPS:
- PRE_MEM_WRITE( "ioctl(IIOCGETCPS)", ARG3,
- VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
-@@ -4373,6 +4399,8 @@
- case VKI_BLKROGET:
- PRE_MEM_WRITE( "ioctl(BLKROGET)", ARG3, sizeof(int));
- break;
-+ case VKI_BLKRRPART:
-+ break;
- case VKI_BLKGETSIZE:
- PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
- break;
-@@ -4381,6 +4409,8 @@
- case VKI_BLKRAGET:
- PRE_MEM_WRITE( "ioctl(BLKRAGET)", ARG3, sizeof(long));
- break;
-+ case VKI_BLKFLSBUF:
-+ break;
- case VKI_BLKFRASET:
- break;
- case VKI_BLKFRAGET:
-@@ -4447,6 +4477,8 @@
- PRE_MEM_WRITE( "ioctl(CDROMREADTOCENTRY)", ARG3,
- sizeof(struct vki_cdrom_tocentry));
- break;
-+ case VKI_CDROMEJECT:
-+ break;
- case VKI_CDROMMULTISESSION: /* 0x5310 */
- PRE_MEM_WRITE( "ioctl(CDROMMULTISESSION)", ARG3,
- sizeof(struct vki_cdrom_multisession));
-@@ -5321,7 +5353,28 @@
- case VKI_SG_GET_SG_TABLESIZE:
- POST_MEM_WRITE(ARG3, sizeof(int));
- break;
-+ case VKI_SCSI_IOCTL_GET_IDLUN:
-+ POST_MEM_WRITE(ARG3, sizeof(vki_scsi_idlun_t));
-+ break;
-+ case VKI_SCSI_IOCTL_PROBE_HOST:
-+ if (RES > 0 && ARG3 )
-+ POST_MEM_WRITE(ARG3, sizeof(char)*RES);
-+ break;
-+ case VKI_SCSI_IOCTL_GET_BUS_NUMBER:
-+ POST_MEM_WRITE(ARG3, sizeof(int));
-+ break;
-
-+ case VKI_FDRESET:
-+ break;
-+ case VKI_FDGETDRVTYP:
-+ POST_MEM_WRITE( ARG3, sizeof(char)*16 );
-+ break;
-+ case VKI_FDPOLLDRVSTAT:
-+ POST_MEM_WRITE( ARG3, sizeof(vki_floppy_drive_struct_t) );
-+ break;
-+ case VKI_FDGETPRM:
-+ POST_MEM_WRITE( ARG3, sizeof(vki_floppy_struct_t) );
-+ break;
- case VKI_IIOCGETCPS:
- POST_MEM_WRITE( ARG3, VKI_ISDN_MAX_CHANNELS * 2 * sizeof(unsigned long) );
- break;
-@@ -5542,6 +5595,8 @@
- case VKI_BLKROGET:
- POST_MEM_WRITE(ARG3, sizeof(int));
- break;
-+ case VKI_BLKRRPART:
-+ break;
- case VKI_BLKGETSIZE:
- POST_MEM_WRITE(ARG3, sizeof(unsigned long));
- break;
-@@ -5550,6 +5605,8 @@
- case VKI_BLKRAGET:
- POST_MEM_WRITE(ARG3, sizeof(long));
- break;
-+ case VKI_BLKFLSBUF:
-+ break;
- case VKI_BLKFRASET:
- break;
- case VKI_BLKFRAGET:
-@@ -5591,6 +5648,8 @@
- case VKI_CDROMREADTOCENTRY:
- POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_tocentry));
- break;
-+ case VKI_CDROMEJECT:
-+ break;
- case VKI_CDROMMULTISESSION:
- POST_MEM_WRITE(ARG3, sizeof(struct vki_cdrom_multisession));
- break;
-Index: valgrind-3.7.0/include/vki/vki-linux.h
-===================================================================
---- valgrind-3.7.0.orig/include/vki/vki-linux.h 2011-10-26 23:24:31.000000000 +0200
-+++ valgrind-3.7.0/include/vki/vki-linux.h 2011-12-22 14:53:16.258126390 +0100
-@@ -1654,7 +1654,9 @@
-
- #define VKI_BLKROSET _VKI_IO(0x12,93) /* set device read-only (0 = read-write) */
- #define VKI_BLKROGET _VKI_IO(0x12,94) /* get read-only status (0 = read_write) */
-+#define VKI_BLKRRPART _VKI_IO(0x12,95) /* re-read partition table */
- #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
-+#define VKI_BLKFLSBUF _VKI_IO(0x12,97) /* flush buffer cache */
- #define VKI_BLKRASET _VKI_IO(0x12,98) /* set read ahead for block device */
- #define VKI_BLKRAGET _VKI_IO(0x12,99) /* get current read ahead setting */
- #define VKI_BLKFRASET _VKI_IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-@@ -1729,6 +1731,53 @@
- //#define SG_GET_COMMAND_Q 0x2270 /* Yields 0 (queuing off) or 1 (on) */
- #define VKI_SG_SET_COMMAND_Q 0x2271 /* Change queuing state with 0 or 1 */
-
-+typedef struct vki_scsi_idlun
-+{
-+ int mux4;
-+ int host_unique_id;
-+
-+} vki_scsi_idlun_t;
-+#define VKI_SCSI_IOCTL_GET_IDLUN 0x5382 /* Gets a struct vki_scsi_idlun */
-+#define VKI_SCSI_IOCTL_PROBE_HOST 0x5385 /* Gets an arrary describing the SCSI host */
-+#define VKI_SCSI_IOCTL_GET_BUS_NUMBER 0x5386 /* Get the bus number for a device */
-+
-+//----------------------------------------------------------------------
-+// From linux-2.6.8.1/include/linux/fd.h
-+//----------------------------------------------------------------------
-+#define VKI_FDRESET 0x254 /* Takes an int by value */
-+#define VKI_FDGETDRVTYP 0x20f /* Returns char floppy_drive_name[16] */
-+typedef struct vki_floppy_drive_struct {
-+ unsigned long flags;
-+ unsigned long spinup_date;
-+ unsigned long select_date;
-+ unsigned long first_read_date;
-+ short probed_format;
-+ short track;
-+ short maxblock;
-+ short maxtrack;
-+ int generation;
-+ int keep_data;
-+ int fd_ref;
-+ int fd_device;
-+ unsigned long last_checked;
-+ char *dmabuf;
-+ int bufblocks;
-+} vki_floppy_drive_struct_t;
-+#define VKI_FDPOLLDRVSTAT 0x213 /* returns a struct floppy_drive_struct */
-+typedef struct vki_floppy_struct {
-+ unsigned int size;
-+ unsigned int sect;
-+ unsigned int head;
-+ unsigned int track;
-+ unsigned int stretch;
-+ unsigned char gap;
-+ unsigned char rate;
-+ unsigned char spec1;
-+ unsigned char fmt_gap;
-+ const char * name;
-+} vki_floppy_struct_t;
-+#define VKI_FDGETPRM 0x204 /* returns a struct floppy_struct */
-+
- //----------------------------------------------------------------------
- // From linux-2.6.8.1/include/linux/cdrom.h
- //----------------------------------------------------------------------
-@@ -1738,6 +1787,7 @@
- (struct cdrom_tochdr) */
- #define VKI_CDROMREADTOCENTRY 0x5306 /* Read TOC entry
- (struct cdrom_tocentry) */
-+#define VKI_CDROMEJECT 0x5309 /* Eject cdrom media */
- #define VKI_CDROMSUBCHNL 0x530b /* Read subchannel data
- (struct cdrom_subchnl) */
- #define VKI_CDROMREADMODE2 0x530c /* Read CDROM mode 2 data (2336 Bytes)
diff --git a/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
index ea91a00..3358c24 100644
--- a/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
+++ b/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
@@ -8,10 +8,10 @@ Signed-off-by: Pierre Habouzit <madcoder@debian.org>
coregrind/m_machine.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
-Index: valgrind-3.7.0/coregrind/m_machine.c
+Index: b/coregrind/m_machine.c
===================================================================
---- valgrind-3.7.0.orig/coregrind/m_machine.c 2011-10-27 12:45:52.000000000 +0200
-+++ valgrind-3.7.0/coregrind/m_machine.c 2011-12-22 14:53:19.758067046 +0100
+--- a/coregrind/m_machine.c
++++ b/coregrind/m_machine.c
@@ -27,6 +27,10 @@
The GNU General Public License is contained in the file COPYING.
*/
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index cdebbec..ff35e6c 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -4,7 +4,7 @@
#
#############################################################
-VALGRIND_VERSION = 3.7.0
+VALGRIND_VERSION = 3.8.1
VALGRIND_SITE = http://valgrind.org/downloads/
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
VALGRIND_LICENSE = GPLv2 GFDLv1.2
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] valgrind: rename patches without version in the filename
From: Thomas Petazzoni @ 2012-12-19 23:14 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...r-check.patch => valgrind-compiler-check.patch} | 0
...ch => valgrind-dont-include-a-out-header.patch} | 0
...ort.patch => valgrind-fix-ccache-support.patch} | 0
....0-largefile.patch => valgrind-largefile.patch} | 0
...ore-ioctls.patch => valgrind-more-ioctls.patch} | 0
...ch => valgrind-workaround-SIGSEGV-on-PPC.patch} | 0
6 files changed, 0 insertions(+), 0 deletions(-)
rename package/valgrind/{valgrind-3.7.0-compiler-check.patch => valgrind-compiler-check.patch} (100%)
rename package/valgrind/{valgrind-3.7.0-dont-include-a-out-header.patch => valgrind-dont-include-a-out-header.patch} (100%)
rename package/valgrind/{valgrind-3.7.0-fix-ccache-support.patch => valgrind-fix-ccache-support.patch} (100%)
rename package/valgrind/{valgrind-3.7.0-largefile.patch => valgrind-largefile.patch} (100%)
rename package/valgrind/{valgrind-3.7.0-more-ioctls.patch => valgrind-more-ioctls.patch} (100%)
rename package/valgrind/{valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch => valgrind-workaround-SIGSEGV-on-PPC.patch} (100%)
diff --git a/package/valgrind/valgrind-3.7.0-compiler-check.patch b/package/valgrind/valgrind-compiler-check.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-compiler-check.patch
rename to package/valgrind/valgrind-compiler-check.patch
diff --git a/package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch b/package/valgrind/valgrind-dont-include-a-out-header.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-dont-include-a-out-header.patch
rename to package/valgrind/valgrind-dont-include-a-out-header.patch
diff --git a/package/valgrind/valgrind-3.7.0-fix-ccache-support.patch b/package/valgrind/valgrind-fix-ccache-support.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-fix-ccache-support.patch
rename to package/valgrind/valgrind-fix-ccache-support.patch
diff --git a/package/valgrind/valgrind-3.7.0-largefile.patch b/package/valgrind/valgrind-largefile.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-largefile.patch
rename to package/valgrind/valgrind-largefile.patch
diff --git a/package/valgrind/valgrind-3.7.0-more-ioctls.patch b/package/valgrind/valgrind-more-ioctls.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-more-ioctls.patch
rename to package/valgrind/valgrind-more-ioctls.patch
diff --git a/package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch b/package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
similarity index 100%
rename from package/valgrind/valgrind-3.7.0-workaround-SIGSEGV-on-PPC.patch
rename to package/valgrind/valgrind-workaround-SIGSEGV-on-PPC.patch
--
1.7.9.5
^ permalink raw reply
* [Buildroot] [PATCH 1/4] libglib2: bumped version to 2.32.4
From: Thomas Petazzoni @ 2012-12-19 23:08 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50D24484.8010001@mind.be>
Dear Arnout Vandecappelle,
On Wed, 19 Dec 2012 23:49:40 +0100, Arnout Vandecappelle wrote:
> > Could you justify why this patch is no longer needed?
>
> Are you serious? The second line of the patch says:
> "This patch is already included upstream, from the glib-2.32.4 release."
Missed it, sorry. 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 1/4] libglib2: bumped version to 2.32.4
From: Arnout Vandecappelle @ 2012-12-19 22:49 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121219202217.34f0959f@skate>
On 19/12/12 20:22, Thomas Petazzoni wrote:
> Dear bogdan at nimblex.org,
>
> On Wed, 19 Dec 2012 16:58:41 +0000, 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>
>> ---
>> ...b2-make-codegen-python2-python3-compliant.patch | 192 ---------------------
>
> Could you justify why this patch is no longer needed?
Are you serious? The second line of the patch says:
"This patch is already included upstream, from the glib-2.32.4 release."
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply
* [Buildroot] [PATCH 1/1] cairo graphics bump version to 1.12.8 and drop patch
From: Sagaert Johan @ 2012-12-19 22:42 UTC (permalink / raw)
To: buildroot
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
package/cairo/cairo-1.10.2-directfb.patch | 36 -------------------------------
package/cairo/cairo.mk | 6 ++++--
2 files changed, 4 insertions(+), 38 deletions(-)
delete mode 100644 package/cairo/cairo-1.10.2-directfb.patch
diff --git a/package/cairo/cairo-1.10.2-directfb.patch b/package/cairo/cairo-1.10.2-directfb.patch
deleted file mode 100644
index 8b4c6f7..0000000
--- a/package/cairo/cairo-1.10.2-directfb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- cairo-1.10.2/src/cairo-directfb-surface.c 2010-06-18 12:47:12.000000000 +0100
-+++ cairo-1.10.2.mod/src/cairo-directfb-surface.c 2012-02-02 11:40:57.835273391 +0000
-@@ -700,6 +700,7 @@
- surface->dfbsurface->Blit (surface->dfbsurface,
- buffer, NULL,
- image_rect->x, image_rect->y);
-+ surface->dfbsurface->ReleaseSource (surface->dfbsurface);
- }
-
- cairo_surface_destroy (&image->base);
-@@ -928,6 +929,9 @@
- cairo_surface_attributes_t *src_attr)
- {
- _cairo_pattern_release_surface (src_pattern, src, src_attr);
-+
-+ if (dst->dfbsurface)
-+ dst->dfbsurface->ReleaseSource (dst->dfbsurface);
- }
- #endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
-
-@@ -1584,6 +1588,7 @@
-
- new_cache->dfbsurface->Blit (new_cache->dfbsurface,
- cache->dfbsurface, NULL, 0, 0);
-+ new_cache->dfbsurface->ReleaseSource (new_cache->dfbsurface);
-
- _directfb_destroy_font_cache (cache);
- scaled_font->surface_private = cache = new_cache;
-@@ -1809,6 +1814,7 @@
- RUN_CLIPPED (dst, clip_region, NULL,
- dst->dfbsurface->BatchBlit (dst->dfbsurface,
- cache->dfbsurface, rects, points, num));
-+ dst->dfbsurface->ReleaseSource (dst->dfbsurface);
-
- return CAIRO_STATUS_SUCCESS;
- }
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 59a032a..46881ef 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -3,8 +3,10 @@
# cairo
#
#############################################################
-CAIRO_VERSION = 1.10.2
-CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.gz
+CAIRO_VERSION = 1.12.8
+CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
+CAIRO_LICENSE = LGPLv2.1+
+CAIRO_LICENSE_FILES = COPYING
CAIRO_SITE = http://cairographics.org/releases
CAIRO_INSTALL_STAGING = YES
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] sg3-utils new package.
From: Thomas Petazzoni @ 2012-12-19 22:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAAfyv35TW9i7-R1KJEnJSkOyV2dvkhabtFPnLip-fifEdop+QQ@mail.gmail.com>
Dear Belisko Marek,
On Wed, 19 Dec 2012 23:11:31 +0100, Belisko Marek wrote:
> configure.ac:13: the top level
> configure.ac:225: warning: AM_NLS is m4_require'd but not m4_defun'd
> aclocal.m4:1204: IT_PROG_INTLTOOL is expanded from...
> configure.ac:225: the top level
> configure:14234: error: possibly undefined macro: AM_NLS
> If this token and others are legitimate, please use m4_pattern_allow.
> See the Autoconf documentation.
>
> Am I missing some dependency?
I guess this macro is installed by gettext, but not sure.
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 1/1] pixman : bump version to 0.28.2
From: Sagaert Johan @ 2012-12-19 22:35 UTC (permalink / raw)
To: buildroot
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
---
package/pixman/pixman.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
index 4879594..607f82e 100644
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -3,7 +3,7 @@
# pixman
#
################################################################################
-PIXMAN_VERSION = 0.25.2
+PIXMAN_VERSION = 0.28.2
PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib
PIXMAN_INSTALL_STAGING = YES
PIXMAN_DEPENDENCIES = host-pkgconf
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] libdvdnav: requires thread support in toolchain
From: Thomas Petazzoni @ 2012-12-19 22:34 UTC (permalink / raw)
To: buildroot
libdvdnav requires thread support. The only package that depends on
libdvdnav is mplayer, and it is an optional dependency, only activated
when libdvdnav is enabled. So we don't have to push this thread
support dependency to any other package.
Fixes:
http://autobuild.buildroot.org/results/54d6a737ae805ef1dbf77e5d11b4dd5366873ec0/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libdvdnav/Config.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/libdvdnav/Config.in b/package/libdvdnav/Config.in
index 5ba31e8..4585be9 100644
--- a/package/libdvdnav/Config.in
+++ b/package/libdvdnav/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBDVDNAV
bool "libdvdnav"
depends on BR2_LARGEFILE # libdvdread
+ depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_LIBDVDREAD
help
libdvdnav is a library that allows easy use of sophisticated
@@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBDVDNAV
http://www.mplayerhq.hu
-comment "libdvdnav requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+comment "libdvdnav requires a toolchain with LARGEFILE and thread support"
+ depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] Any way to override .config settings?
From: Charles Manning @ 2012-12-19 22:20 UTC (permalink / raw)
To: buildroot
Hi buildrooters
I need to be able to build a system from an svn repository using a
bunch of different revisions for different elements. For example, I
might want to use the kernel at r 1234, u-boot at r 4567 and the
rootfs+apps at r 3344.
Now I could achieve this by going into the .config with menuconfig and
changing the config, but I would prefer to be able to have a file of
revisions to use and have buildroot pick up those revision symbols
instead.
I guess there are a few ways this could be handled:
1) Is there a built in mechanism in buildroot to include extra symbols
and override those in .config?
2) Run my own script that nobbles the .config using sed etc.
Is there something built in to buildroot that will do this?
Thanks
Charles
^ permalink raw reply
* [Buildroot] [PATCH] sg3-utils new package.
From: Belisko Marek @ 2012-12-19 22:11 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121218100332.7a0c10d0@skate>
Hi Thomas,
On Tue, Dec 18, 2012 at 10:03 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Belisko Marek,
>
> On Tue, 18 Dec 2012 09:52:41 +0100, Belisko Marek wrote:
>
>> > Hum, why is this needed? Does sg3_utils installs some libraries or
>> > headers that are useful for other packages?
>> I'm working on adding udisks to buildroot and udisks have dependency on
>> sg3-utils library so this is the reason why installing to staging.
>
> Ok. A comment just before the _INSTALL_STAGING line would be useful,
> then, because for a "utils" package, we don't necessarily expect to
> have a library in it.
>
>> I've read somewhere on ML you was working also on udisks package.
>> Was it successful?
>
> It was a looong time ago. I think I managed to get udisks to build, but
> I hadn't had the time to do some real testing with it: I was first
> doing some testing of polkit, which is a dependency of udisks.
>
> I've put online the 3 patches I had done at that time (note that they
> are old: they still use the old AUTOTARGETS macro name), see:
> http://free-electrons.com/~thomas/pub/udisks-buildroot/
Thanks for patches. I made small update and I can compile polkit without
problems but I have still problems with udisks.
Basically udisks have only autogen.sh script and I was trying to use:
UDISKS_AUTORECONF = YES macro.
With this change it fails during autoreconfiguring:
configure.ac:13: the top level
configure.ac:225: warning: AM_NLS is m4_require'd but not m4_defun'd
aclocal.m4:1204: IT_PROG_INTLTOOL is expanded from...
configure.ac:225: the top level
configure:14234: error: possibly undefined macro: AM_NLS
If this token and others are legitimate, please use m4_pattern_allow.
See the Autoconf documentation.
Am I missing some dependency?
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
Thanks,
marek
--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer
Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
^ permalink raw reply
* [Buildroot] [PATCH 1/4] libglib2: bumped version to 2.32.4
From: Sven Neumann @ 2012-12-19 22:03 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1898585649.1424283.1355934492400.JavaMail.root@advansee.com>
Hi,
On Wed, 2012-12-19 at 17:28 +0100, Beno?t Th?baudeau wrote:
> > - 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?
No, actually you added this to buildroot way after we've done our
changes to update libglib2. So the removal of these two lines is
probably just an artefact from rebasing our old patch on top of current
buildroot. I don't think we've removed them on purpose.
It's been a while since we've done the switch to libglib2. And as I said
in the patch that Bogdan submitted, not all the changes are ready for
inclusion in buildroot. But let me try to give some background on the
changes that we've done. I've collected this from our buildroot git log,
so bear with me if I don't remember all the details.
+ ac_cv_alignof_guint32=4 ac_cv_alignof_guint64=4 ac_cv_alignof_unsigned_long=4 \
These are definitely not right for all platforms. But I found that the
alignment checks in the glib configure script don't get the correct
result when cross-compiling. So I've added this to force the correct
values for our platforms (ARM and Geode).
+ CPPFLAGS=-D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \
This turned out to be necessary on our ARM platform. On ARMv5 atomic
operations are not actually available as inlines but libgcc does still
provide them as functions. Without tricking glib into using the
functions it would use mutex-based fallbacks.
+ 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 \
The xlocale based implementations of g_ascii_strto{d,ll,ull} and
g_ascii_formatd crash with uClibC. At least they did this with the
version of uCLibC that we used back then (that was version 0.9.32 as far
as I can see). So this change tricks the configure script into believing
that this functionality was not available so that the good old
home-grown code is used again as it was the case before 2.32.
So the submitted patch for libglib2 should not be taken as final. But I
hope that this will nevertheless help to get libglib2 updated in
buildroot for the next release.
Regards,
Sven
^ permalink raw reply
* [Buildroot] [PATCH 1/4] libglib2: bumped version to 2.32.4
From: Thomas Petazzoni @ 2012-12-19 19:22 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355936324-9585-1-git-send-email-bogdan@nimblex.org>
Dear bogdan at nimblex.org,
On Wed, 19 Dec 2012 16:58:41 +0000, 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>
> ---
> ...b2-make-codegen-python2-python3-compliant.patch | 192 ---------------------
Could you justify why this patch is no longer needed?
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/2] dbus: fix permissions of the installed launch helper
From: Gary Coulbourne @ 2012-12-19 18:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355942638-27288-1-git-send-email-bear@bears.org>
DBus uses a suid root launch helper to automatically start and stop services. This does not
get installed properly, and requires fixup after installation to have the correct permissions.
Signed-off-by: Gary Coulbourne <bear@bears.org>
---
package/dbus/dbus.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 694cbfe..f7f6d6d 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -87,6 +87,10 @@ HOST_DBUS_CONF_OPT = \
# dbus for the host
DBUS_HOST_INTROSPECT=$(HOST_DBUS_DIR)/introspect.xml
+define DBUS_PERMISSIONS
+/usr/libexec/dbus-daemon-launch-helper f 4750 0 81 - - - - -
+endef
+
HOST_DBUS_GEN_INTROSPECT = \
$(HOST_DIR)/usr/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT)
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] dbus: bump dbus version from 1.4.24 to current 1.6.8
From: Gary Coulbourne @ 2012-12-19 18:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355942638-27288-1-git-send-email-bear@bears.org>
Signed-off-by: Gary Coulbourne <bear@bears.org>
---
package/dbus/dbus.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index ec42874..694cbfe 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,7 +3,7 @@
# dbus
#
#############################################################
-DBUS_VERSION = 1.4.24
+DBUS_VERSION = 1.6.8
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
DBUS_INSTALL_STAGING = YES
--
1.7.10.4
^ permalink raw reply related
* [Buildroot] [PATCH 0/2] Resend using proper tools of my dbus version bump / permissions patch
From: Gary Coulbourne @ 2012-12-19 18:43 UTC (permalink / raw)
To: buildroot
This is a set of patches which fix a broken permissions problem in dbus and bump the version.
Gary Coulbourne (2):
dbus: bump dbus version from 1.4.24 to current 1.6.8
dbus: fix permissions of the installed launch helper
package/dbus/dbus.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--
1.7.10.4
^ permalink raw reply
* [Buildroot] [PATCH] Add support for dtb file in /boot directory on target
From: Gary Coulbourne @ 2012-12-19 17:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <50D0A947.5090107@mind.be>
On 12/18/2012 12:35 PM, Arnout Vandecappelle wrote:
> Could you also resend this patch with git send-email? (See its man
> page for how to configure it for gmail.)
Sure thing.
> Perhaps the whitespace is correct and gmail ate it, but just to be sure:
> indentation should be one tab.
I assume gmail ate it. I use tabs by default in makefile-ish files.
> Or are there use cases where you want the DTB in /boot, but not the
> kernel image?
It seems the logical place for the dtb to live, with the kernel, bit it
is possible someone would not want that.
Is there a consensus from the folks on the mailing list about what
should be done with the dtb?
Peace,
Gary
^ permalink raw reply
* [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
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