diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 20:39:07 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 20:39:07 +0200 |
commit | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (patch) | |
tree | 10c726d162bc0ded85eb7aeacf8f246bd39ad63a /package/faad2 | |
parent | bbd610f15a71b27c955175cb98392b114717fd47 (diff) |
optimize ipkg package management
- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)
more cleanups needed after allmodconfig
Diffstat (limited to 'package/faad2')
-rw-r--r-- | package/faad2/Makefile | 24 | ||||
-rw-r--r-- | package/faad2/ipkg/libfaad2.control | 4 | ||||
-rw-r--r-- | package/faad2/patches/patch-common_mp4ff_Makefile_am | 16 | ||||
-rw-r--r-- | package/faad2/patches/patch-common_mp4ff_mp4ff_h | 12 | ||||
-rw-r--r-- | package/faad2/patches/patch-configure_in | 11 | ||||
-rw-r--r-- | package/faad2/patches/patch-frontend_Makefile_am | 12 |
6 files changed, 13 insertions, 66 deletions
diff --git a/package/faad2/Makefile b/package/faad2/Makefile index c4052b209..ed707cc86 100644 --- a/package/faad2/Makefile +++ b/package/faad2/Makefile @@ -6,27 +6,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= faad2 -PKG_VERSION:= 2.6.1 +PKG_VERSION:= 2.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 74e92df40c270f216a8305fc87603c8a -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} -WRKDIST= ${WRKDIR}/faad2 +PKG_MD5SUM:= ee1b4d67ea2d76ee52c5621bc6dbf61e +PKG_DESCR:= A mp4 decoding library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/faac/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=faac/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= autotool gnu +CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --without-mpeg4ip \ --without-xmms BUILD_STYLE= auto INSTALL_STYLE= auto -pre-install: - ${INSTALL_DIR} ${WRKINST}/usr/lib - ${INSTALL_DIR} ${WRKINST}/usr/include - ${CP} ${WRKBUILD}/common/mp4ff/libmp4ff.a ${WRKINST}/usr/lib - ${CP} ${WRKBUILD}/common/mp4ff/mp4ff.h ${WRKINST}/usr/include +#pre-install: +# ${INSTALL_DIR} ${WRKINST}/usr/lib +# ${INSTALL_DIR} ${WRKINST}/usr/include +# ${CP} ${WRKBUILD}/common/mp4ff/libmp4ff.a ${WRKINST}/usr/lib +# ${CP} ${WRKBUILD}/common/mp4ff/mp4ff.h ${WRKINST}/usr/include post-install: ${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib diff --git a/package/faad2/ipkg/libfaad2.control b/package/faad2/ipkg/libfaad2.control deleted file mode 100644 index 81fa375f0..000000000 --- a/package/faad2/ipkg/libfaad2.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libfaad2 -Priority: optional -Section: libs -Description: A mp4 decoding library diff --git a/package/faad2/patches/patch-common_mp4ff_Makefile_am b/package/faad2/patches/patch-common_mp4ff_Makefile_am deleted file mode 100644 index 3e471d6de..000000000 --- a/package/faad2/patches/patch-common_mp4ff_Makefile_am +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/common/mp4ff/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ faad2/common/mp4ff/Makefile.am 2009-01-11 17:15:38.138931843 +0100 -@@ -1,8 +1,9 @@ --noinst_LTLIBRARIES = libmp4ff.la -+lib_LIBRARIES = libmp4ff.a -+include_HEADERS = mp4ff.h mp4ffint.h - --libmp4ff_la_CFLAGS = -DUSE_TAGGING=1 -+libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 - --libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ -+libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ - mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \ - drms.h drms.c drmstables.h - diff --git a/package/faad2/patches/patch-common_mp4ff_mp4ff_h b/package/faad2/patches/patch-common_mp4ff_mp4ff_h deleted file mode 100644 index cfca4f560..000000000 --- a/package/faad2/patches/patch-common_mp4ff_mp4ff_h +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/common/mp4ff/mp4ff.h 2007-11-01 13:33:29.000000000 +0100 -+++ faad2/common/mp4ff/mp4ff.h 2009-01-11 16:52:07.174753204 +0100 -@@ -35,7 +35,7 @@ - extern "C" { - #endif /* __cplusplus */ - --#include "mp4ff_int_types.h" -+#include <stdint.h> - - /* file callback structure */ - typedef struct diff --git a/package/faad2/patches/patch-configure_in b/package/faad2/patches/patch-configure_in deleted file mode 100644 index be4b20530..000000000 --- a/package/faad2/patches/patch-configure_in +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/configure.in 2006-09-25 21:52:53.000000000 +0200 -+++ faad2/configure.in 2009-01-08 16:50:34.056700106 +0100 -@@ -16,6 +16,7 @@ AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for programs. - AC_PROG_CC -+AC_PROG_CXX - AC_PROG_CPP - dnl disable for mpeg4ip plugin - dnl AC_PROG_CXX diff --git a/package/faad2/patches/patch-frontend_Makefile_am b/package/faad2/patches/patch-frontend_Makefile_am deleted file mode 100644 index e0efa1aca..000000000 --- a/package/faad2/patches/patch-frontend_Makefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- faad2.orig/frontend/Makefile.am 2006-05-07 20:09:00.000000000 +0200 -+++ faad2/frontend/Makefile.am 2009-01-11 17:16:19.901544559 +0100 -@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(t - -I$(top_srcdir)/common/mp4ff - - faad_LDADD = $(top_builddir)/libfaad/libfaad.la \ -- $(top_builddir)/common/mp4ff/libmp4ff.la -+ $(top_builddir)/common/mp4ff/libmp4ff.a - - faad_SOURCES = main.c \ - audio.c audio.h \ |