From 469b35af91f6b8123943bab064ecf362e28bc438 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Dec 2013 10:54:03 +0100
Subject: fix xbmc build, use swig and sdl host, add CEC,NFS, SSH and Samba
support
---
TODO | 3 --
package/libXt/Makefile | 3 +-
package/libXt/patches/patch-util_Makefile_in | 2 +-
package/libbluray/Makefile | 1 +
package/libcec/Makefile | 34 ++++++++++++++++++
package/liblzo/Makefile | 11 ++++--
package/libnfs/Makefile | 28 +++++++++++++++
package/libssh/Makefile | 34 ++++++++++++++++++
package/openafs/Makefile | 2 +-
package/rtmpdump/Makefile | 40 ++++++++++++++++++++++
package/rtmpdump/patches/patch-Makefile | 28 +++++++++++++++
package/rtmpdump/patches/patch-Makefile.orig | 28 +++++++++++++++
package/rtmpdump/patches/patch-librtmp_Makefile | 36 +++++++++++++++++++
package/samba/Makefile | 4 +--
package/sdl-image/Makefile | 6 +++-
package/sdl/Makefile | 7 +++-
package/squid/Makefile | 4 +--
package/swig/Makefile | 26 ++++++++++++++
.../patches/patch-src_libudev_libudev_pc_in | 15 ++++++++
package/taglib/Makefile | 4 +--
package/util-macros/Makefile | 4 +--
package/xbmc/Makefile | 18 +++++++---
.../patches/patch-lib_libdvd_libdvdread_Makefile | 13 +++++++
scripts/scan-pkgs.sh | 5 ---
24 files changed, 327 insertions(+), 29 deletions(-)
create mode 100644 package/libcec/Makefile
create mode 100644 package/libnfs/Makefile
create mode 100644 package/libssh/Makefile
create mode 100644 package/rtmpdump/Makefile
create mode 100644 package/rtmpdump/patches/patch-Makefile
create mode 100644 package/rtmpdump/patches/patch-Makefile.orig
create mode 100644 package/rtmpdump/patches/patch-librtmp_Makefile
create mode 100644 package/swig/Makefile
create mode 100644 package/systemd/patches/patch-src_libudev_libudev_pc_in
create mode 100644 package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
diff --git a/TODO b/TODO
index 57ab4fb30..f5b7ac867 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,3 @@
- check for gcc and SSP again
- port full blown perl
- port w3m
-- port libcec for xbmc
-- check xbmc samba/nfs support
-- add support for librtmp in xbmc
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 4e4e8a8db..69cd67d2f 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1
PKG_DESCR:= X Toolkit Intrinsics libraries
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb
-PKG_BUILDDEP:= libSM libX11 kbproto
+PKG_BUILDDEP:= autotool libSM libX11 kbproto util-macros
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_LIBNAME:= libxt
PKG_OPTS:= dev
@@ -19,6 +19,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+AUTOTOOL_STYLE:= autoreconf
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
index a92166c93..b20260a8e 100644
--- a/package/libXt/patches/patch-util_Makefile_in
+++ b/package/libXt/patches/patch-util_Makefile_in
@@ -5,7 +5,7 @@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS =
++CPPFLAGS = @CPPFLAGS_FOR_BUILD@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
diff --git a/package/libbluray/Makefile b/package/libbluray/Makefile
index 1988ce7d6..4fe695207 100644
--- a/package/libbluray/Makefile
+++ b/package/libbluray/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= c7a1cc71cb9747f93122ec650d4ae933
PKG_DESCR:= bluray library
PKG_SECTION:= libs
+PKG_BUILDDEP:= libxml2
PKG_URL:= http://www.videolan.org/developers/libbluray.html
PKG_SITES:= ftp://ftp.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/
PKG_OPTS:= dev
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
new file mode 100644
index 000000000..e085df139
--- /dev/null
+++ b/package/libcec/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libcec
+PKG_VERSION:= 2.1.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= d65e52ab3295e9e4b73bf4580f3bd4f7
+PKG_DESCR:= control your device with your TV remote control
+PKG_SECTION:= libs
+PKG_BUILDDEP:= autotool
+PKG_URL:= http://libcec.pulse-eight.com/
+PKG_SITES:= http://www.openadk.org/distfiles
+PKG_OPTS:= dev
+
+PKG_SYSTEM_DEPENDS:= raspberry-pi
+PKG_LIBC_DEPENDS:= eglibc glibc musl
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBCEC,libcec,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:= autoreconf
+CONFIGURE_ARGS+= --enable-rpi \
+ --with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
+ --with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
+
+libcec-install:
+ $(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libcec*.so* \
+ $(IDIR_LIBCEC)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index 37955a774..3f79d0317 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -4,11 +4,12 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= lzo
-PKG_VERSION:= 2.04
-PKG_RELEASE:= 2
-PKG_MD5SUM:= a383c7055a310e2a71b9ecd19cfea238
+PKG_VERSION:= 2.06
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 95380bd4081f85ef08c5209f4107e9f8
PKG_DESCR:= a real-time data compression library
PKG_SECTION:= libs
+PKG_BUILDDEP:= liblzo-host
PKG_URL:= http://www.oberhumer.com/opensource/lzo
PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/
PKG_LIBNAME:= liblzo
@@ -18,10 +19,13 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
+include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
+$(eval $(call HOST_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
+HOST_STYLE:= auto
CONFIGURE_ARGS+= --enable-static
MAKE_FLAGS+= CFLAGS_O="${TARGET_CFLAGS}"
@@ -29,4 +33,5 @@ liblzo-install:
${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib
${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnfs/Makefile b/package/libnfs/Makefile
new file mode 100644
index 000000000..2ad21801f
--- /dev/null
+++ b/package/libnfs/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libnfs
+PKG_VERSION:= 1.8.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 0f20c7c104aa2e2ee563169b7e164aab
+PKG_DESCR:= NFS client library
+PKG_SECTION:= libs
+PKG_BUILDDEP:= autotool
+PKG_URL:= https://github.com/sahlberg/libnfs
+PKG_SITES:= https://sites.google.com/site/libnfstarballs/li/
+PKG_OPTS:= dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBNFS,libnfs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+AUTOTOOL_STYLE:= autoreconf
+
+libnfs-install:
+ $(INSTALL_DIR) $(IDIR_LIBNFS)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libnfs*.so* \
+ $(IDIR_LIBNFS)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
new file mode 100644
index 000000000..34f282de2
--- /dev/null
+++ b/package/libssh/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= libssh
+PKG_VERSION:= 0.5.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc
+PKG_DESCR:= SSH library
+PKG_SECTION:= libs
+PKG_DEPENDS:= libopenssl zlib
+PKG_BUILDDEP:= openssl zlib
+PKG_URL:= http://www.libssh.org/
+PKG_SITES:= http://www.libssh.org/files/0.5/
+PKG_OPTS:= dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj
+CONFIG_STYLE:= manual
+
+do-configure:
+ (cd $(WRKBUILD) && PATH='${TARGET_PATH}' cmake -DCMAKE_SYSTEM_NAME=Linux \
+ -DCMAKE_INSTALL_PREFIX=/usr -DZLIB_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' $(WRKSRC)/)
+
+libssh-install:
+ $(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libssh*.so* \
+ $(IDIR_LIBSSH)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openafs/Makefile b/package/openafs/Makefile
index a5a81dcc0..d22a1d691 100644
--- a/package/openafs/Makefile
+++ b/package/openafs/Makefile
@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= openafs
-PKG_VERSION:= 1.6.5
+PKG_VERSION:= 1.6.5.1
PKG_RELEASE:= 1
PKG_MD5SUM:= e33e0b031760d4f90815d40b8ab3c540
PKG_DESCR:= AFS implementation
diff --git a/package/rtmpdump/Makefile b/package/rtmpdump/Makefile
new file mode 100644
index 000000000..c85f823fd
--- /dev/null
+++ b/package/rtmpdump/Makefile
@@ -0,0 +1,40 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= rtmpdump
+PKG_VERSION:= 2.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 61509a2ae8987691f1fa28175461be96
+PKG_DESCR:= toolkit for RTMP streams
+PKG_DEPENDS:= librtmp zlib libopenssl
+PKG_BUILDDEP:= openssl zlib
+PKG_SECTION:= multimedia
+PKG_URL:= http://rtmpdump.mplayerhq.hu/
+PKG_SITES:= http://www.openadk.org/distfiles
+PKG_LIBNAME:= librtmp
+PKG_OPTS:= dev
+
+PKG_SUBPKGS:= RTMPDUMP LIBRTMP
+PKGSD_LIBRTMP:= library for RTMP streams
+PKGSC_LIBRTMP:= libs
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RTMPDUMP,rtmpdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBRTMP,librtmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBRTMP},${PKGSC_LIBRTMP}))
+
+CONFIG_STYLE:= manual
+
+rtmpdump-install:
+ $(INSTALL_DIR) $(IDIR_RTMPDUMP)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/rtmpdump \
+ $(IDIR_RTMPDUMP)/usr/bin
+
+librtmp-install:
+ $(INSTALL_DIR) $(IDIR_LIBRTMP)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/librtmp*so.* \
+ $(IDIR_LIBRTMP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rtmpdump/patches/patch-Makefile b/package/rtmpdump/patches/patch-Makefile
new file mode 100644
index 000000000..64f950750
--- /dev/null
+++ b/package/rtmpdump/patches/patch-Makefile
@@ -0,0 +1,28 @@
+--- rtmpdump-2.4.orig/Makefile 2013-12-15 14:24:48.000000000 +0100
++++ rtmpdump-2.4/Makefile 2013-12-15 15:18:27.000000000 +0100
+@@ -1,9 +1,9 @@
+ VERSION=v2.4
+
+-prefix=/usr/local
++prefix=/usr
+
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
++CC?=$(CROSS)gcc
++LD?=$(CROSS)ld
+
+ SYS=posix
+ #SYS=mingw
+@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
+-LDFLAGS=-Wall $(XLDFLAGS)
++CFLAGS?=
++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF)
++LDFLAGS?=
++LDFLAGS+=-Wall $(XLDFLAGS)
+
+ bindir=$(prefix)/bin
+ sbindir=$(prefix)/sbin
diff --git a/package/rtmpdump/patches/patch-Makefile.orig b/package/rtmpdump/patches/patch-Makefile.orig
new file mode 100644
index 000000000..9b10246bb
--- /dev/null
+++ b/package/rtmpdump/patches/patch-Makefile.orig
@@ -0,0 +1,28 @@
+--- rtmpdump-2.4.orig/Makefile 2013-12-15 14:24:48.000000000 +0100
++++ rtmpdump-2.4/Makefile 2013-12-15 15:17:36.000000000 +0100
+@@ -1,9 +1,9 @@
+ VERSION=v2.4
+
+-prefix=/usr/local
++prefix=/usr
+
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
++CC=$(CROSS)gcc
++LD=$(CROSS)ld
+
+ SYS=posix
+ #SYS=mingw
+@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
+-LDFLAGS=-Wall $(XLDFLAGS)
++CFLAGS?=
++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF)
++LDFLAGS?=
++LDFLAGS+=-Wall $(XLDFLAGS)
+
+ bindir=$(prefix)/bin
+ sbindir=$(prefix)/sbin
diff --git a/package/rtmpdump/patches/patch-librtmp_Makefile b/package/rtmpdump/patches/patch-librtmp_Makefile
new file mode 100644
index 000000000..8efd7ecb8
--- /dev/null
+++ b/package/rtmpdump/patches/patch-librtmp_Makefile
@@ -0,0 +1,36 @@
+--- rtmpdump-2.4.orig/librtmp/Makefile 2013-12-15 14:24:48.000000000 +0100
++++ rtmpdump-2.4/librtmp/Makefile 2013-12-15 15:20:13.000000000 +0100
+@@ -1,6 +1,6 @@
+ VERSION=v2.4
+
+-prefix=/usr/local
++prefix=/usr
+
+ incdir=$(prefix)/include/librtmp
+ bindir=$(prefix)/bin
+@@ -11,9 +11,9 @@ INCDIR=$(DESTDIR)$(incdir)
+ LIBDIR=$(DESTDIR)$(libdir)
+ MANDIR=$(DESTDIR)$(mandir)
+
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
+-AR=$(CROSS_COMPILE)ar
++CC?=$(CROSS_COMPILE)gcc
++LD?=$(CROSS_COMPILE)ld
++AR?=$(CROSS_COMPILE)ar
+
+ SYS=posix
+ CRYPTO=OPENSSL
+@@ -74,8 +74,10 @@ SO_INST=$(SOINST_$(SHARED))
+
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
+-LDFLAGS=$(XLDFLAGS)
++CFLAGS?=
++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(SO_DEF)
++LDFLAGS?=
++LDFLAGS+=$(XLDFLAGS)
+
+
+ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 7d04d4ee2..5c090d1b8 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -62,8 +62,6 @@ samba-install:
${IDIR_SAMBA}/usr/lib/samba/charset
${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba
${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
- ${CP} ${WRKINST}/usr/lib/samba/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
- ${IDIR_SAMBA}/usr/lib/samba
${CP} ${WRKINST}/usr/lib/samba/vfs/*.so* ${IDIR_SAMBA}/usr/lib/samba/vfs
${INSTALL_DATA} ${WRKINST}/usr/lib/samba/*.dat ${IDIR_SAMBA}/usr/lib/samba
@@ -79,6 +77,8 @@ samba-client-install:
samba-lib-install:
${INSTALL_DIR} ${IDIR_SAMBA_LIB}/usr/lib/samba
+ ${CP} ${WRKINST}/usr/lib/samba/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
+ ${IDIR_SAMBA}/usr/lib/samba
$(CP) ${WRKINST}/usr/lib/samba/{libtalloc,libtdb,libtevent}.* \
${IDIR_SAMBA_LIB}/usr/lib/samba
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index 7aa1d1930..3f5e2b06d 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
PKG_DEPENDS:= libpng libtiff libjpeg libsdl
-PKG_BUILDDEP:= libpng libtiff jpeg sdl
+PKG_BUILDDEP:= sdl-image-host libpng libtiff jpeg sdl
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/
PKG_NEED_CXX:= 1
@@ -20,10 +20,13 @@ PKG_OPTS:= dev
DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION}
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
CONFIGURE_ARGS+= --enable-png \
--enable-jpg \
--enable-bmp \
@@ -33,4 +36,5 @@ libsdl-image-install:
$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index bb20aad1d..3a76249ae 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext
-PKG_BUILDDEP:= libusb alsa-lib libX11 libXext
+PKG_BUILDDEP:= sdl-host libusb alsa-lib libX11 libXext
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/release/
PKG_LIBNAME:= libsdl
@@ -24,10 +24,14 @@ PKGFB_WITH_TSLIB:= tslib
DISTFILES:= SDL-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION}
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
+
ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y)
CONFIGURE_ARGS+= --enable-input-tslib
endif
@@ -45,4 +49,5 @@ libsdl-install:
$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 205bd49da..0204db928 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,7 +4,7 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= squid
-PKG_VERSION:= 3.3.11
+PKG_VERSION:= 3.4.1
PKG_RELEASE:= 1
PKG_MD5SUM:= 1db9aa98a70e501ae8280bc5cfa33140
PKG_DESCR:= squid web and cache proxy
@@ -12,7 +12,7 @@ PKG_SECTION:= proxy
PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl
PKG_BUILDDEP:= openssl libtool
PKG_URL:= http://www.squid-cache.org/
-PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.3/
+PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/
PKG_MULTI:= 1
PKG_NEED_CXX:= 1
diff --git a/package/swig/Makefile b/package/swig/Makefile
new file mode 100644
index 000000000..6bc9f2b05
--- /dev/null
+++ b/package/swig/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= swig
+PKG_VERSION:= 2.0.11
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 291ba57c0acd218da0b0916c280dcbae
+PKG_DESCR:= swig utility
+PKG_SECTION:= lang
+PKG_URL:= http://www.swig.org/
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=swig/}
+
+PKG_ARCH_DEPENDS:= native
+
+include $(TOPDIR)/mk/host.mk
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call HOST_template,SWIG,swig,$(PKG_VERSION)-${PKG_RELEASE}))
+
+HOST_STYLE:= auto
+HOST_ALL_TARGET:= swig
+
+include ${TOPDIR}/mk/host-bottom.mk
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/systemd/patches/patch-src_libudev_libudev_pc_in b/package/systemd/patches/patch-src_libudev_libudev_pc_in
new file mode 100644
index 000000000..7bc3ab6f3
--- /dev/null
+++ b/package/systemd/patches/patch-src_libudev_libudev_pc_in
@@ -0,0 +1,15 @@
+--- systemd-208.orig/src/libudev/libudev.pc.in 2013-08-13 22:02:46.000000000 +0200
++++ systemd-208/src/libudev/libudev.pc.in 2013-12-14 17:20:31.000000000 +0100
+@@ -6,9 +6,9 @@
+ # (at your option) any later version.
+
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++exec_prefix=${prefix}/usr
++libdir=${prefix}/lib
++includedir=${prefix}/include
+
+ Name: libudev
+ Description: Library to access udev device information
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index 493cf5abf..a71973676 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= dcb8bd1b756f2843e18b1fdf3aaeee15
PKG_DESCR:= Audio Meta-Data library
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
-PKG_BUILDDEP:= zlib
+PKG_BUILDDEP:= cmake-host zlib
PKG_URL:= http://taglib.github.com/
PKG_SITES:= http://openadk.org/distfiles/
PKG_OPTS:= dev
@@ -22,7 +22,7 @@ $(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
CONFIG_STYLE:= manual
do-configure:
- (cd ${WRKBUILD} && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .)
+ (cd ${WRKBUILD} && PATH='${TARGET_PATH}' cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .)
pre-install:
$(INSTALL_DATA) ./files/taglib.pc $(WRKBUILD)/
diff --git a/package/util-macros/Makefile b/package/util-macros/Makefile
index 83f2827e9..6ebfb6171 100644
--- a/package/util-macros/Makefile
+++ b/package/util-macros/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= util-macros
-PKG_VERSION:= 1.8.0
+PKG_VERSION:= 1.18.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= fe73a69d02bd0be6cdf7c773bfd72041
+PKG_MD5SUM:= fd0ba21b3179703c071bbb4c3e5fb0f4
PKG_DESCR:= xorg macros
PKG_SECTION:= x11/misc
PKG_BUILDDEP:= autotool util-macros-host
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index b4f96f47f..5eacadcc9 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= xbmc
PKG_VERSION:= 12.2
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
@@ -17,13 +17,15 @@ PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng
PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate
PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
PKG_DEPENDS+= omxplayer libusb-compat libbluray libgpg-error
+PKG_DEPENDS+= libssh libcec libnfs librtmp
PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass
PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
PKG_BUILDDEP+= bcm2835-vc libgpg-error dbus libusb-compat libbluray
-PKG_BUILDDEP+= libgpg-error
+PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump
+PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://mirrors.xbmc.org/releases/source/
@@ -41,19 +43,25 @@ TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \
-I$(STAGING_DIR)/opt/vc/include \
-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
+TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static \
+ -L$(STAGING_DIR)/usr/lib/samba
AUTOTOOL_STYLE:= autoreconf
+CONFIGURE_ENV+= DESTDIR='${WRKINST}' \
+ TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
CONFIGURE_ARGS+= --disable-optical-drive \
- --disable-ssh \
- --disable-samba \
--disable-mysql \
+ --enable-samba \
+ --enable-ssh \
+ --enable-nfs \
--enable-libusb \
--enable-libbluray \
--enable-external-libraries \
--enable-player=omxplayer \
--enable-gles \
+ --enable-rtmp \
--disable-sdl \
--disable-joystick \
+ --disable-dvdcss \
--disable-x11 \
--with-platform=raspberry-pi
diff --git a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
new file mode 100644
index 000000000..799e54eeb
--- /dev/null
+++ b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile
@@ -0,0 +1,13 @@
+--- xbmc-12.2.orig/lib/libdvd/libdvdread/Makefile 2013-05-03 07:57:40.000000000 +0200
++++ xbmc-12.2/lib/libdvd/libdvdread/Makefile 2013-12-15 12:24:12.000000000 +0100
+@@ -131,8 +131,8 @@ distclean: clean
+ dvdread-config: $(.OBJDIR)/dvdread-config
+ $(.OBJDIR)/dvdread-config: $(BUILDDEPS)
+ @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config
+- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config
+- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config
++ @echo 'prefix='$(DESTDIR)$(PREFIX) >> $(.OBJDIR)/dvdread-config
++ @echo 'libdir='$(DESTDIR)$(shlibdir) >> $(.OBJDIR)/dvdread-config
+ @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config
+ @echo >> $(.OBJDIR)/dvdread-config
+ cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 5d4a80abc..4c201560a 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -105,11 +105,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
NEED_GPERF="$NEED_GPERF eglibc"
fi
-if [[ -n $ADK_PACKAGE_XBMC ]]; then
- NEED_SDLDEV="$NEED_SDLDEV xbmc"
- NEED_SDLIMAGEDEV="$NEED_SDLIMAGEDEV xbmc"
-fi
-
if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then
NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi"
fi
--
cgit v1.2.3