From patchwork Thu Jun 9 07:46:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dagg Stompler X-Patchwork-Id: 632662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQHSP6cP1z9s8d for ; Thu, 9 Jun 2016 17:46:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8506A89710; Thu, 9 Jun 2016 07:46:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ywpNxO7JWuEz; Thu, 9 Jun 2016 07:46:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 459F9896BC; Thu, 9 Jun 2016 07:46:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7FBB41C2DD2 for ; Thu, 9 Jun 2016 07:46:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7C7408901A for ; Thu, 9 Jun 2016 07:46:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nZQ_44_4532g for ; Thu, 9 Jun 2016 07:46:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0887B896BC for ; Thu, 9 Jun 2016 07:46:37 +0000 (UTC) Received: from localhost.localdomain ([192.117.63.7]) by mail.gmx.com (mrgmx101) with ESMTPA (Nemesis) id 0MPHrQ-1b6Uot25jc-004OtD for ; Thu, 09 Jun 2016 09:46:35 +0200 From: Dagg Stompler To: buildroot@buildroot.org Date: Thu, 9 Jun 2016 10:46:43 +0300 Message-Id: <20160609074644.4976-1-daggs@gmx.com> X-Mailer: git-send-email 2.8.3 X-Provags-ID: V03:K0:M31Ejmo5TS3I0QVienkrrwmL2yIP6tBkcO0R+PUJFfS3w1KNoX/ h1XsLdbfnu60NOciamcosUYjPFMV6EvLjoW5AmFXd/VchZz407D/RZeggxzdUdapFfPLc5p k8KBph0BKu9cmiWrPqgkz9SoZAYyXd5w92yQKFZyGVxphEdRr9gxrLxhPmu4bD8y6wxHPQG JdURxWu54QlO+yP6lWF9w== X-UI-Out-Filterresults: notjunk:1; V01:K0:5V9YNEbCCp8=:29piOhyRRdM9t+6VgiQ341 pIgVi/7Xj8K5WnD5p6bDOKaH66umS7Y6iV81F7Y6xzrfZe3lkjjAj7dU/kwmV2GujWUJm6g2t RrnPbAraN2iGz8D8bVkkkB3ahyC2XL2tmkwjYgx0S+F+6afpl52B2Sl0Sho3zIFJWkdMoV9HB 1SzP8TuvwmBPcYAEbGyINfyGg+OtDWtZ8FCVwIbrQU6fsl5/SeT1l5TK1cBSw0I/GUBzU23JV Drz7TxJaig2NNPK05p/xI/YNX34ms1IDKU1uzXzhFqEpWXj81Atau5iEuIVsHBw+VoxiUYUtd w8LS/c2R0B1UBRUOQFJnE9A8D5BjnZWBNDt31fAcJzwbgtXN9MgqmueWe90t93WC5KrTTXUfk ANQRmqc8ZV7A8iwSYYFwJ9W0FnnNx6AwXmSWUlGkv2P9AMAYyZm4qHV5NThd3DsvakSt3cs+n 6SCTnC1M8CBQx6BatHA4VVI70LgYrh340u7qLQAZbBDST0KkXomcGvLxgeuxM+2aek6dN5Jcy XoUV7uTnQajXqMmjc2aAHO2BTZchD9gyZpJ/iYODjS4HtC/HbiJlUfuow2jIL7Z8ilkb6r5UY Jwzen892sc7JnuJF9vQisEQk0CUNPYE2pqK1UgNsw2cf6gGdoFQjocZdiqvj0UwLGHM65SPBv rlGAtpa4Xq/IM1jLQ9/483ewK5c/r4y6bgrrw8QlMiaOJ/4A08sKhtcWXJUjUIsD/va8w1R6q 7YbSfl0IBMR9TI0HDObFr7FxG3Ljk691pdlMBH+DbNihS8KLNvi924y6KEU= Subject: [Buildroot] [PATCH 1/2] libamcodec: New Package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Dagg Stompler --- package/Config.in | 1 + .../libamcodec/0001-fix_flags_in_makefile.patch | 70 ++++++++++++++++++++++ package/libamcodec/Config.in | 13 ++++ package/libamcodec/libamcodec.hash | 2 + package/libamcodec/libamcodec.mk | 33 ++++++++++ 5 files changed, 119 insertions(+) create mode 100644 package/libamcodec/0001-fix_flags_in_makefile.patch create mode 100644 package/libamcodec/Config.in create mode 100644 package/libamcodec/libamcodec.hash create mode 100644 package/libamcodec/libamcodec.mk diff --git a/package/Config.in b/package/Config.in index de9573e..1af5d6e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1087,6 +1087,7 @@ endmenu menu "Multimedia" source "package/bitstream/Config.in" + source "package/libamcodec/Config.in" source "package/libass/Config.in" source "package/libbluray/Config.in" source "package/libdcadec/Config.in" diff --git a/package/libamcodec/0001-fix_flags_in_makefile.patch b/package/libamcodec/0001-fix_flags_in_makefile.patch new file mode 100644 index 0000000..e64c4d7 --- /dev/null +++ b/package/libamcodec/0001-fix_flags_in_makefile.patch @@ -0,0 +1,70 @@ +--- a/amcodec/Makefile 2016-06-02 12:06:53.000000000 +0300 ++++ b/amcodec/Makefile 2016-06-02 12:07:34.000000000 +0300 +@@ -27,12 +27,12 @@ TARGET?=libamcodec.so + + DIRS=audio_ctl/ codec/ + +-LDFLAGS= -O2 -L$(LIB_DIR) -lm -lc -shared -Wl,--shared -Wl,-soname,$(TARGET)$(LIB_VERSION) ++override LDFLAGS+= -O2 -L$(LIB_DIR) -lm -lc -shared -Wl,--shared -Wl,-soname,$(TARGET)$(LIB_VERSION) + + #INCLUDE=$(DIRS:%/=-I$(SRC)/%/include) + INCLUDE=${SRCTREE}/include/ + #CFLAGS=-O0 -gdwarf-2 -g +-CFLAGS=-O2 -g -I$(SRC)/include -I${SRCTREE}/audio_ctl -I${SRCTREE}/codec -I${SRCTREE}/../amadec/include -fPIC ++override CFLAGS+=-O2 -g -I$(SRC)/include -I${SRCTREE}/audio_ctl -I${SRCTREE}/codec -I${SRCTREE}/../amadec/include -fPIC + + + +--- a/amavutils/Makefile 2016-06-02 11:48:11.000000000 +0300 ++++ b/amavutils/Makefile 2016-06-02 11:46:14.000000000 +0300 +@@ -8,13 +8,13 @@ TARGET=libamavutils.so + + INSTALL_DIR=${LIB_DIR}/aml_libs + +-LDFLAGS += -shared -lpthread -lm -lrt ++override LDFLAGS += -shared -lpthread -lm -lrt + + TOPDIR=$(shell pwd) + SRC?=$(TOPDIR) + +-CFLAGS+=-O2 -fPIC -g +-CFLAGS+=-I$(SRC) -I$(SRC)/include -I$(SRC)/../amcodec/include -L${LIB_DIR} -I$(HEADERS_DIR) ++override CFLAGS+=-O2 -fPIC -g ++override CFLAGS+=-I$(SRC) -I$(SRC)/include -I$(SRC)/../amcodec/include -L${LIB_DIR} -I$(HEADERS_DIR) + + + +--- a/amadec/Makefile 2016-06-02 12:03:48.000000000 +0300 ++++ b/amadec/Makefile 2016-06-02 12:04:11.000000000 +0300 +@@ -10,14 +10,14 @@ TARGET=libamadec.so + + INSTALL_DIR=$(LIB_DIR)/aml_libs + +-LDFLAGS += -shared -lpthread -lm -lasound -lrt ++override LDFLAGS += -shared -lpthread -lm -lasound -lrt + + TOPDIR=$(shell pwd) + SRC?=$(TOPDIR) + +-CFLAGS+=-O2 -fPIC -g +-CFLAGS+=-I$(SRC) -I$(SRC)/include -I$(SRC)/../amavutils/include -I$(SRC)/../amplayer/player/include -I${HEADERS_DIR} -L${LIB_DIR} +-CFLAGS+=-DALSA_OUT ++override CFLAGS+=-O2 -fPIC -g ++override CFLAGS+=-I$(SRC) -I$(SRC)/include -I$(SRC)/../amavutils/include -I$(SRC)/../amplayer/player/include -I${HEADERS_DIR} -L${LIB_DIR} ++override CFLAGS+=-DALSA_OUT + + ifdef DOLBY_UDC + CFLAGS+=-DDOLBY_USE_ARMDEC +--- a/amcodec/rules.mk 2016-06-04 15:49:31.000000000 +0300 ++++ b/amcodec/rules.mk 2016-06-04 15:49:41.000000000 +0300 +@@ -2,8 +2,8 @@ + + + dir_mk=$(Q)echo "MAKE $(1)";\ +- $(MAKE) -C ${1} -f ${SRCTREE}/depends.mk;\ +- $(MAKE) -C ${1} -f ${SRCTREE}/dir.mk ++ $(MAKE) -C ${1} -f ${SRCTREE}/depends.mk CFLAGS="$(CFLAGS)";\ ++ $(MAKE) -C ${1} -f ${SRCTREE}/dir.mk CFLAGS="$(CFLAGS)" + + c_mk=$(Q)echo "CC $(1)";\ + $(CC) $(CFLAGS) $(EXT_CFLAGS) -c $(1) diff --git a/package/libamcodec/Config.in b/package/libamcodec/Config.in new file mode 100644 index 0000000..52778ba --- /dev/null +++ b/package/libamcodec/Config.in @@ -0,0 +1,13 @@ +comment "libamcodec needs a toolchain w/ threads" + depends on BR2_arm || BR2_aarch64 + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_LIBAMCODEC + bool "libamcodec" + depends on BR2_arm || BR2_aarch64 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + select BR2_PACKAGE_ALSA_LIB + help + Interface library for Amlogic media codecs + + https://github.com/mdrjr/c2_aml_libs.git diff --git a/package/libamcodec/libamcodec.hash b/package/libamcodec/libamcodec.hash new file mode 100644 index 0000000..3a0055f --- /dev/null +++ b/package/libamcodec/libamcodec.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 44580255c63bde1544b1376bc8d33f73ef0c634afda5065455a01b77f6e2729b libamcodec-ed1d8b8c54b05c1a02a8ee44c59744e4cbed3d8d.tar.gz diff --git a/package/libamcodec/libamcodec.mk b/package/libamcodec/libamcodec.mk new file mode 100644 index 0000000..1e0bcb6 --- /dev/null +++ b/package/libamcodec/libamcodec.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libamcodec +# +################################################################################ + +LIBAMCODEC_VERSION = ed1d8b8c54b05c1a02a8ee44c59744e4cbed3d8d +LIBAMCODEC_SITE = $(call github,mdrjr,c2_aml_libs,$(LIBAMCODEC_VERSION)) +LIBAMCODEC_DEPENDENCIES = alsa-lib + +# This package uses the M_PREFIX variable to construct the header and +# # library paths used when compiling +define LIBAMCODEC_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/amavutils M_PREFIX="$(STAGING_DIR)/usr" + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/amadec M_PREFIX="$(STAGING_DIR)/usr" + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/amcodec PREFIX="$(STAGING_DIR)" +endef + +define LIBAMCODEC_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(STAGING_DIR)/usr/lib/libamavutils.so + $(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(STAGING_DIR)/usr/lib/libamadec.so + $(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(STAGING_DIR)/usr/lib/libamcodec.so + mkdir -p $(STAGING_DIR)/usr/include/amcodec + cp -rf $(@D)/amcodec/include/* $(STAGING_DIR)/usr/include/amcodec +endef + +define LIBAMCODEC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(TARGET_DIR)/usr/lib/libamavutils.so + $(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(TARGET_DIR)/usr/lib/libamadec.so + $(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(TARGET_DIR)/usr/lib/libamcodec.so +endef + +$(eval $(generic-package))