From c940dfa0425a03e962432d9d50c9beea304c7e9e Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 7 Oct 2014 20:28:17 -0700 Subject: Add package libaacs Signed-off-by: Timothy Gu --- index.html | 4 ++++ src/libaacs-1-config.patch | 35 +++++++++++++++++++++++++++++++++++ src/libaacs-2-pkgconfig.patch | 24 ++++++++++++++++++++++++ src/libaacs-test.c | 18 ++++++++++++++++++ src/libaacs.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100644 src/libaacs-1-config.patch create mode 100644 src/libaacs-2-pkgconfig.patch create mode 100644 src/libaacs-test.c create mode 100644 src/libaacs.mk diff --git a/index.html b/index.html index c7b01dd..4bc502e 100644 --- a/index.html +++ b/index.html @@ -1568,6 +1568,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) Libarchive + libaacs + libaacs + + libass libass diff --git a/src/libaacs-1-config.patch b/src/libaacs-1-config.patch new file mode 100644 index 0000000..ab354c4 --- /dev/null +++ b/src/libaacs-1-config.patch @@ -0,0 +1,35 @@ +This file is part of MXE. +See index.html for further information. + +From c4e50ffd858342b65beaffb4027be75ca7f10b05 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 7 Oct 2014 18:48:57 -0700 +Subject: [PATCH] Look for prefixed config scripts + +Signed-off-by: Timothy Gu + +diff --git a/configure.ac b/configure.ac +index 155acad..8cb7e79 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -126,7 +126,7 @@ if test x$libgcrypt_config_prefix != x ; then + fi + fi + +-AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + if test x"$LIBGCRYPT_CONFIG" = xno; then + AC_MSG_ERROR([libgcrypt not found on system]) + else +@@ -149,7 +149,7 @@ if test x$gpg_error_config_prefix != x ; then + fi + fi + +-AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) ++AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no) + if test x"$GPG_ERROR_CONFIG" = xno; then + AC_MSG_ERROR([gpg-error not found on system]) + else +-- +1.8.3.2 + diff --git a/src/libaacs-2-pkgconfig.patch b/src/libaacs-2-pkgconfig.patch new file mode 100644 index 0000000..489ea67 --- /dev/null +++ b/src/libaacs-2-pkgconfig.patch @@ -0,0 +1,24 @@ +This file is part of MXE. +See index.html for further information. + +From 461de1dc2a6c611fc1e95678f765c7ff2648ee08 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 7 Oct 2014 19:41:43 -0700 +Subject: [PATCH] pkgconfig: Take libgpg-error and libgcrypt into account for + static builds + +Signed-off-by: Timothy Gu + +diff --git a/src/libaacs.pc.in b/src/libaacs.pc.in +index 598f206..4334d8c 100644 +--- a/src/libaacs.pc.in ++++ b/src/libaacs.pc.in +@@ -7,4 +7,5 @@ Name: libaacs + Description: AACS support library for Blu-ray playback + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -laacs ++Libs.private: @LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@ + Cflags: -I${includedir} +-- +1.8.3.2 + diff --git a/src/libaacs-test.c b/src/libaacs-test.c new file mode 100644 index 0000000..35701e4 --- /dev/null +++ b/src/libaacs-test.c @@ -0,0 +1,18 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main (int argc, char **argv) +{ + int major, minor, micro; + + (void)argc; + (void)argv; + + aacs_get_version(&major, &minor, µ); + + return 0; +} diff --git a/src/libaacs.mk b/src/libaacs.mk new file mode 100644 index 0000000..00c3400 --- /dev/null +++ b/src/libaacs.mk @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libaacs +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.7.1 +$(PKG)_CHECKSUM := 09eb61bcfceca77cd779c4475093dd22a0cb5510 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 +$(PKG)_URL := http://ftp.videolan.org/pub/videolan/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.videolan.org/pub/videolan/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libgcrypt libgpg_error + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://ftp.videolan.org/pub/videolan/libaacs/' | \ + $(SED) -n 's,