summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/alsa-lib/Makefile4
-rw-r--r--package/logitechmediaserver/Makefile2
-rw-r--r--package/mpdbox/Makefile6
-rw-r--r--package/p5-audio-scan/Makefile2
-rw-r--r--package/p5-dbd-sqlite/Makefile4
-rw-r--r--package/p5-dbi/Makefile9
-rw-r--r--package/perl/Makefile17
-rw-r--r--package/squeezelite/Makefile8
8 files changed, 34 insertions, 18 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 6461e02f4..dd5e9a3b2 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= alsa-lib
PKG_VERSION:= 1.0.28
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= c9e21b88a2b3e6e12ea7ba0f3b271fc3
PKG_DESCR:= sound library
PKG_SECTION:= libs/audio
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --disable-python
alsa-lib-install:
${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib
- ${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa
+ ${CP} ${WRKINST}/usr/share/alsa/alsa.conf ${IDIR_ALSA_LIB}/usr/share/alsa
include ${ADK_TOPDIR}/mk/host-bottom.mk
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/logitechmediaserver/Makefile b/package/logitechmediaserver/Makefile
index 6d118f4e0..daafeefb0 100644
--- a/package/logitechmediaserver/Makefile
+++ b/package/logitechmediaserver/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= popular media server
PKG_SECTION:= mm/audio
PKG_DEPENDS:= perl p5-xml-parser p5-dbi p5-ev p5-html-parser
PKG_DEPENDS+= p5-json-xs p5-digest-sha1 p5-yaml-xs p5-sub-name
-PKG_DEPENDS+= p5-xml-parser-expat p5-time-hires p5-common-sense
+PKG_DEPENDS+= p5-xml-parser-expat p5-common-sense
PKG_DEPENDS+= p5-types-serialiser p5-audio-scan p5-image-scale
PKG_DEPENDS+= p5-dbd-sqlite p5-tie-refhash
PKG_BUILDDEP:= perl
diff --git a/package/mpdbox/Makefile b/package/mpdbox/Makefile
index b431a0b72..b0f2c2605 100644
--- a/package/mpdbox/Makefile
+++ b/package/mpdbox/Makefile
@@ -4,16 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= mpdbox
-PKG_VERSION:= 1.0
-PKG_RELEASE:= 2
+PKG_VERSION:= 1.0.1
+PKG_RELEASE:= 1
PKG_MD5SUM:= ac0dc1cc7141c1eca66d8ddd98574e0b
PKG_DESCR:= mpd web interface
PKG_SECTION:= mm/audio
PKG_URL:= http://www.openadk.org/cgi-bin/gitweb.cgi?p=mpdbox.git;a=summary
PKG_SITES:= http://www.openadk.org/distfiles/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,MPDBOX,mpdbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/p5-audio-scan/Makefile b/package/p5-audio-scan/Makefile
index 346dd5681..e08f27718 100644
--- a/package/p5-audio-scan/Makefile
+++ b/package/p5-audio-scan/Makefile
@@ -20,6 +20,8 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,P5_AUDIO_SCAN,p5-audio-scan,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_CFLAGS+= -fPIC
+
include $(ADK_TOPDIR)/mk/perl.mk
CONFIG_STYLE:= perl
diff --git a/package/p5-dbd-sqlite/Makefile b/package/p5-dbd-sqlite/Makefile
index 1be5008c6..abcd09a83 100644
--- a/package/p5-dbd-sqlite/Makefile
+++ b/package/p5-dbd-sqlite/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 86cfaf477cb9ddc39508f74f4268fc79
PKG_DESCR:= self-contained rdbms in a dbi driver
PKG_SECTION:= dev/perl
-PKG_DEPENDS:= perl
-PKG_BUILDDEP:= perl
+PKG_DEPENDS:= perl p5-dbi
+PKG_BUILDDEP:= perl p5-dbi-host
PKG_SITES:= http://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/
DISTFILES:= DBD-SQLite-${PKG_VERSION}.tar.gz
diff --git a/package/p5-dbi/Makefile b/package/p5-dbi/Makefile
index 6380059dd..1c85cf8be 100644
--- a/package/p5-dbi/Makefile
+++ b/package/p5-dbi/Makefile
@@ -16,18 +16,27 @@ PKG_SITES:= http://cpan.metacpan.org/authors/id/T/TI/TIMB/
DISTFILES:= DBI-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/DBI-${PKG_VERSION}
+include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,P5_DBI,p5-dbi,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,P5_DBI,p5-dbi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TARGET_CFLAGS+= -fPIC
+
include $(ADK_TOPDIR)/mk/perl.mk
+HOST_STYLE:= perl
CONFIG_STYLE:= perl
XAKE_FLAGS+= $(PERL_ENV)
+hostpost-install:
+ (cd $(WRKBUILD) && PATH='$(HOST_PATH)' $(HOST_PERL_ENV) make install)
+
p5-dbi-install:
$(INSTALL_DIR) $(IDIR_P5_DBI)$(PERL_SITEDIR)
$(CP) $(WRKINST)$(PERL_SITEDIR)/* \
$(IDIR_P5_DBI)$(PERL_SITEDIR)
+include ${ADK_TOPDIR}/mk/host-bottom.mk
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/perl/Makefile b/package/perl/Makefile
index b866cb05c..11fa4678e 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -34,8 +34,9 @@ host-configure:
$(SED) "s#@@STAGING_HOST_DIR@@/perl-host#./perl#" ${WRKBUILD}/Makefile.SH
$(SED) "s#@@LIB@@#-Ilib#" ${WRKBUILD}/Makefile.SH
# darwin workaround
+ $(CP) ${WRKBUILD}/hints/darwin.sh ${WRKBUILD}/hints/darwin.sh.bak
$(SED) "s#^usedl.*##" ${WRKBUILD}/hints/darwin.sh
- (cd ${WRKBUILD}; ${BASH} ./Configure -des -Duseperlio -Uusedl -Uusethreads -Uuseshrplib -Dprefix=${STAGING_HOST_DIR}/usr)
+ (cd ${WRKBUILD}; ${BASH} ./Configure -des -Uusedl -Uusethreads -Duseperlio -Uuseshrplib -Dprefix=${STAGING_HOST_DIR}/usr)
host-build:
cd ${WRKBUILD} && env CC_FOR_BUILD="gcc" ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
@@ -44,8 +45,16 @@ host-build:
perl-hostinstall:
cd ${WRKBUILD} && env CC_FOR_BUILD="gcc" ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
${HOST_MAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
- mv ${STAGING_HOST_DIR}/usr/bin/perl ${STAGING_HOST_DIR}/usr/bin/perl-host
+ mv ${STAGING_HOST_DIR}/usr/bin/perl ${STAGING_HOST_DIR}/usr/bin/perl-static
cp ${WRKBUILD}/miniperl ${STAGING_HOST_DIR}/usr/bin
+ # now build perl a second time for perl modules (dynamic)
+ $(CP) ${WRKBUILD}/hints/darwin.sh.bak ${WRKBUILD}/hints/darwin.sh
+ (cd ${WRKBUILD}; rm config.sh; ${BASH} ./Configure -des -Uuseshrplib -Dprefix=${STAGING_HOST_DIR}/usr)
+ cd ${WRKBUILD} && env CC_FOR_BUILD="gcc" ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
+ cd ${WRKBUILD} && env CC_FOR_BUILD="gcc" ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ ${HOST_MAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
+ mv ${STAGING_HOST_DIR}/usr/bin/perl ${STAGING_HOST_DIR}/usr/bin/perl-host
do-configure:
sed \
@@ -71,7 +80,7 @@ do-build:
(cd ${WRKBUILD}; $(MAKE))
do-install:
- (cd ${WRKBUILD}; $(STAGING_HOST_DIR)/usr/bin/perl-host installperl --destdir=${WRKINST})
+ (cd ${WRKBUILD}; $(STAGING_HOST_DIR)/usr/bin/perl-static installperl --destdir=${WRKINST})
perl-install:
${INSTALL_DIR} ${IDIR_PERL}/usr/bin
@@ -79,7 +88,7 @@ perl-install:
${CP} ${WRKINST}/usr/lib/perl5/${PKG_VERSION}/* \
${IDIR_PERL}/usr/lib/perl5/${PKG_VERSION}
${INSTALL_BIN} ${WRKINST}/usr/bin/perl ${IDIR_PERL}/usr/bin/
- touch $(STAGING_TARGET_DIR)/usr/lib/perl5/$(PKG_VERSION)/$(ADK_TARGET_CPU_ARCH)-linux/CORE/patchlevel-debian.h
+ touch $(IDIR_PERL)/usr/lib/perl5/$(PKG_VERSION)/$(ADK_TARGET_CPU_ARCH)-linux/CORE/patchlevel-debian.h
include ${ADK_TOPDIR}/mk/host-bottom.mk
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile
index 3adf26997..ad58abf97 100644
--- a/package/squeezelite/Makefile
+++ b/package/squeezelite/Makefile
@@ -4,8 +4,8 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= squeezelite
-PKG_VERSION:= 1.5
-PKG_RELEASE:= 3
+PKG_VERSION:= 1.6.4
+PKG_RELEASE:= 1
PKG_MD5SUM:= 7605af4d64291495645f88575a564475
PKG_DESCR:= headless squeezebox emulator
PKG_SECTION:= mm/audio
@@ -16,14 +16,12 @@ PKG_BUILDDEP+= faad2
PKG_URL:= http://code.google.com/p/squeezelite/
PKG_SITES:= http://openadk.org/distfiles/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_LIBC_DEPENDS:= glibc musl
-
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,SQUEEZELITE,squeezelite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE
+TARGET_LDFLAGS+= -ldl
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual