aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-11-01 08:33:02 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-11-01 08:42:43 +0000
commit6fcacbab05db9fca0b5b4c7d51579c1637a25c0f (patch)
tree2400864b326d2e6865caff7a9cb7924972fc04cb
parentd48ee11582b2364d76448fd7c2dd62acee4fcb64 (diff)
downloadaports-6fcacbab05db9fca0b5b4c7d51579c1637a25c0f.tar.bz2
aports-6fcacbab05db9fca0b5b4c7d51579c1637a25c0f.tar.xz
main/xmbc: fix build against samba4
-rw-r--r--main/xbmc/APKBUILD8
-rw-r--r--main/xbmc/samba4.patch20
2 files changed, 26 insertions, 2 deletions
diff --git a/main/xbmc/APKBUILD b/main/xbmc/APKBUILD
index aac6ee70f0..d84d188cc4 100644
--- a/main/xbmc/APKBUILD
+++ b/main/xbmc/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xbmc
pkgver=12.2
-pkgrel=5
+pkgrel=6
pkgdesc="A software media player and entertainment hub for digital media"
url="http://xbmc.org"
arch="x86"
@@ -24,6 +24,7 @@ install=""
options="ldpath-recursive"
source="http://mirrors.xbmc.org/releases/source/$pkgname-$pkgver.tar.gz
no-snesapu.patch
+ samba4.patch
xbmc-uclibc.patch"
_builddir="$srcdir/$pkgname-$pkgver"
@@ -75,10 +76,13 @@ package() {
md5sums="489f3877decae4e265ece54f9eaef0ba xbmc-12.2.tar.gz
5ad388f29ab8f4ca6bc9e2b73bf946ef no-snesapu.patch
+32d11612e948622b195950b93371027c samba4.patch
31ab49159268b20ecec0b73eeefbe15b xbmc-uclibc.patch"
sha256sums="b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c xbmc-12.2.tar.gz
3c04c2cd6909cfb587b194e6c5a3025f1a3f03a0c5178ad70541ff7e69915935 no-snesapu.patch
+de0c56f7ff84bc891d758dba6b3a68d20443e34357cd5dc89e0d4675bfee312c samba4.patch
1af5b669f901108a48a007b6e657820ebe7375f7876bf63a9a29229e9e67b423 xbmc-uclibc.patch"
sha512sums="d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39 xbmc-12.2.tar.gz
8b2b3159b536719bad7c00f2eb51c4778f8e6c049cfe07e2555a530ad8587ca7b83623e1b5f40220d2e490e38442f893f87496620aa94da27d37a8bddc72f434 no-snesapu.patch
+c84cefc90450bc55710ff2f5d12e13b9cdfaf6342647db9acb4c285b63f9d5712956a34c4725f36f39751f2f17c2561f8b5f7c409cd53358567e5915f7bef6bd samba4.patch
cba529e5c5f4395fa3858a24259df0688d1a94dbfd5dc4ee5603b72b9e039611cd8a5bf2ccc5f7a4e78dbfb3e557f5fbc6c93e9630c69186e94044e755f39310 xbmc-uclibc.patch"
diff --git a/main/xbmc/samba4.patch b/main/xbmc/samba4.patch
new file mode 100644
index 0000000000..996992c69e
--- /dev/null
+++ b/main/xbmc/samba4.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.in b/configure.in
+index fa872e8..2743bd2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1522,9 +1522,12 @@ fi
+
+ # samba
+ if test "x$use_samba" != "xno"; then
+- AC_CHECK_LIB([smbclient], [main],,
+- use_samba=no;AC_MSG_ERROR($missing_library))
+- USE_LIBSMBCLIENT=0
++ PKG_CHECK_MODULES([SAMBA], [smbclient],
++ [INCLUDES="$INCLUDES $SAMBA_CFLAGS"; LIBS="$LIBS $SAMBA_LIBS"],
++ [AC_CHECK_LIB([smbclient], [main],,
++ use_samba=no;AC_MSG_ERROR($missing_library))
++ USE_LIBSMBCLIENT=0
++ ])
+ else
+ AC_MSG_RESULT($samba_disabled)
+ USE_LIBSMBCLIENT=0