NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1736fc2a34
kumquat-buildroot/package/x264/x264.mk

65 lines
1.6 KiB
Makefile
Raw Normal View History

package: normalize separator size to 80 Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-20 13:35:19 +01:00
################################################################################
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
#
# x264
#
package: normalize separator size to 80 Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-20 13:35:19 +01:00
################################################################################
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
package/x264: Fix aarch64 support, bump version The current x264 revision fails to include asm code from common/aarch64 which is needed by packages linking to x264, like ffmpeg: Quoting http://autobuild.buildroot.net/results/189/189f215bcbc510cd292c0f337fe6b39979f01813//ffmpeg-2.7.2/config.log /home/test/autobuild/instance-3/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libx264.so: undefined reference to `x264_deblock_h_chroma_422_intra_neon' Function "chroma_422_intra_neon" is defined in x264/common/aarch64/deblock-a.S. The code in x264/common/aarch64/* is only compiled if an assembler was found: http://git.videolan.org/?p=x264.git;a=blob;f=Makefile;h=6193c5936939fda36f9a2e00c734223318ccda14;hb=HEAD#l134 To allow this add BR2_aarch64 as an assembler-enabled arch. This however breaks compilation due to broken NEON detection: "no NEON support, try adding -mfpu=neon to CFLAGS If you really want to run on such a CPU, configure with --disable-asm." The bug was fixed upstream Jul, 25th, 2015: http://git.videolan.org/?p=x264.git;a=commit;h=73ae2d11d472d0eb3b7c218dc1659db32f649b14 When we already have to do a version bump let's take the latest one ;) Fixes http://autobuild.buildroot.net/results/90a/90ae4b2fa8a6cff0f18abea2b1c45282afe99e4b/ http://autobuild.buildroot.net/results/109/109686cbc8327e62f757db576cfff49c490b52ae/ http://autobuild.buildroot.net/results/189/189f215bcbc510cd292c0f337fe6b39979f01813/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-08-30 13:53:21 +02:00
X264_VERSION = e86f3a1993234e8f26050c243aa253651200fa6b
x264: bump to version 20150223-2245-stable Use the Git repository instead of the snapshots, since they are not generated anymore. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-06-11 11:01:44 +02:00
X264_SITE = git://git.videolan.org/x264.git
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
X264_LICENSE = GPLv2+
X264_DEPENDENCIES = host-pkgconf
X264_LICENSE_FILES = COPYING
X264_INSTALL_STAGING = YES
x264: disable avxsynth support Fixes: http://autobuild.buildroot.net/results/0f8/0f8b1167ba23a9a2cd9bd6b6e1baa0470523d47d/ http://autobuild.buildroot.net/results/b65/b651f488fbd6f2985e1a656814098db6c60040e5/ We don't have an avxsynth package in Buildroot, and x264 uses dlopen to access it so it breaks on static only toolchains. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-07 10:01:14 +01:00
X264_CONF_OPTS = --disable-avs
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
ifeq ($(BR2_i386)$(BR2_x86_64),y)
x264: unbreak x86 build after version bump Fixes: http://autobuild.buildroot.net/results/3ec/3ec54f722d6008fc422540d3a5462b306d16e84c/ The recent x264 version bump broke the configure step on x86/x86-64 as x264 ends up using gas instead of yasm as assembler. The reason for this is the recent upstream commit to optionally use nasm instead of yasm if AS= is passed: commit b568a256b9bc6c500d7b1ffe4b9c3311ee5ff337 Author: Henrik Gramner <henrik@gramner.com> Date: Sat May 23 19:44:16 2015 +0200 x86: Experimental nasm support Enables the use of nasm as an alternative to yasm. Note that nasm cannot assemble x264 with PIC enabled since it currently doesn't support [symbol-$$] addressing which is used extensively by x264's PIC code. This includes all 64-bit Windows and 64-bit OS X builds, even non-shared. For the above reason nasm is currently intentionally not auto-detected, instead the assembler must be explicitly specified using "AS=nasm ./configure". Also drop -O2 from ASFLAGS since it's simply ignored anyway. But as we pass AS=$(TARGET_AS) it ends up using gas instead. Fix it by explicitly passing AS=yasm instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-08-31 09:04:09 +02:00
# yasm needed for assembly files
x264: fix non-standard indentation of variable definitions Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 21:37:06 +02:00
X264_DEPENDENCIES += host-yasm
x264: unbreak x86 build after version bump Fixes: http://autobuild.buildroot.net/results/3ec/3ec54f722d6008fc422540d3a5462b306d16e84c/ The recent x264 version bump broke the configure step on x86/x86-64 as x264 ends up using gas instead of yasm as assembler. The reason for this is the recent upstream commit to optionally use nasm instead of yasm if AS= is passed: commit b568a256b9bc6c500d7b1ffe4b9c3311ee5ff337 Author: Henrik Gramner <henrik@gramner.com> Date: Sat May 23 19:44:16 2015 +0200 x86: Experimental nasm support Enables the use of nasm as an alternative to yasm. Note that nasm cannot assemble x264 with PIC enabled since it currently doesn't support [symbol-$$] addressing which is used extensively by x264's PIC code. This includes all 64-bit Windows and 64-bit OS X builds, even non-shared. For the above reason nasm is currently intentionally not auto-detected, instead the assembler must be explicitly specified using "AS=nasm ./configure". Also drop -O2 from ASFLAGS since it's simply ignored anyway. But as we pass AS=$(TARGET_AS) it ends up using gas instead. Fix it by explicitly passing AS=yasm instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-08-31 09:04:09 +02:00
X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm"
package/x264: Fix aarch64 support, bump version The current x264 revision fails to include asm code from common/aarch64 which is needed by packages linking to x264, like ffmpeg: Quoting http://autobuild.buildroot.net/results/189/189f215bcbc510cd292c0f337fe6b39979f01813//ffmpeg-2.7.2/config.log /home/test/autobuild/instance-3/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/lib/libx264.so: undefined reference to `x264_deblock_h_chroma_422_intra_neon' Function "chroma_422_intra_neon" is defined in x264/common/aarch64/deblock-a.S. The code in x264/common/aarch64/* is only compiled if an assembler was found: http://git.videolan.org/?p=x264.git;a=blob;f=Makefile;h=6193c5936939fda36f9a2e00c734223318ccda14;hb=HEAD#l134 To allow this add BR2_aarch64 as an assembler-enabled arch. This however breaks compilation due to broken NEON detection: "no NEON support, try adding -mfpu=neon to CFLAGS If you really want to run on such a CPU, configure with --disable-asm." The bug was fixed upstream Jul, 25th, 2015: http://git.videolan.org/?p=x264.git;a=commit;h=73ae2d11d472d0eb3b7c218dc1659db32f649b14 When we already have to do a version bump let's take the latest one ;) Fixes http://autobuild.buildroot.net/results/90a/90ae4b2fa8a6cff0f18abea2b1c45282afe99e4b/ http://autobuild.buildroot.net/results/109/109686cbc8327e62f757db576cfff49c490b52ae/ http://autobuild.buildroot.net/results/189/189f215bcbc510cd292c0f337fe6b39979f01813/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-08-30 13:53:21 +02:00
else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
x264: use assembly files on ARMv7 [Peter: use positive logic for ifeq, move ARM handling inside ifeq] Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-09 10:41:24 +02:00
# We need to pass gcc as AS, because the ARM assembly files have to be
# preprocessed
X264_CONF_ENV += AS="$(TARGET_CC)"
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
else
x264: fix non-standard indentation of variable definitions Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 21:37:06 +02:00
X264_CONF_OPTS += --disable-asm
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
endif
Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed from "prefer static libraries when possible" to "use only static libraries". The former semantic didn't make much sense, since the user had absolutely no control/idea of which package would use static libraries, and which packages would not. Therefore, for quite some time, we have been starting to enforce that BR2_PREFER_STATIC_LIB should really build everything with static libraries. As a consequence, this patch renames BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS, and adjust the Config.in option accordingly. This also helps preparing the addition of other options to select shared, shared+static or just static. Note that we have verified that this commit can be reproduced by simply doing a global rename of BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-03 22:41:29 +01:00
ifeq ($(BR2_STATIC_LIBS),)
x264: fix non-standard indentation of variable definitions Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 21:37:06 +02:00
X264_CONF_OPTS += --enable-pic --enable-shared
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
endif
ifeq ($(BR2_PACKAGE_X264_CLI),)
x264: fix non-standard indentation of variable definitions Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 21:37:06 +02:00
X264_CONF_OPTS += --disable-cli
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
x264: fix non-standard indentation of variable definitions Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-08 21:37:06 +02:00
X264_CONF_OPTS += --disable-thread
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
endif
# the configure script is not generated by autoconf
define X264_CONFIGURE_CMDS
x264: use assembly files on ARMv7 [Peter: use positive logic for ifeq, move ARM handling inside ifeq] Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-09 10:41:24 +02:00
(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
--prefix=/usr \
--host="$(GNU_TARGET_NAME)" \
--cross-prefix="$(TARGET_CROSS)" \
--disable-ffms \
--enable-static \
x264: disable opencl support We don't have anything providing opencl support in Buildroot, so this is just dead code. More importantly, it uses dlopen so it breaks on completely static configurations. Fixes: http://autobuild.buildroot.net/results/51b/51bd1464fe85f3fcdc5beb095cb1cdbfa413ec24/ http://autobuild.buildroot.net/results/694/694032b21c386c9eb50ba76aa32428bcd5cf9214/ http://autobuild.buildroot.net/results/097/0979f12e50d2413c702147408572b01e6bc700f2/ http://autobuild.buildroot.net/results/d9c/d9c46ca92bc349b42673a60f1b66d6df99d26545/ And many more. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-19 20:53:56 +01:00
--disable-opencl \
x264: new package This package is based on an earlier package proposed by Ayaka in December 2013. Signed-off-by: David du Colombier <0intro@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-05 18:29:56 +02:00
$(X264_CONF_OPTS) \
)
endef
define X264_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
define X264_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install
endef
define X264_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink