summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <jams@linhes.org>2011-01-03 21:57:56 (GMT)
committerJames Meyer <jams@linhes.org>2011-01-03 21:57:56 (GMT)
commit8448ed83b324ae637b425e4aa171563c087075d8 (patch)
tree36fee07e1f9ff64e1ba0998184d40f0771395bcc
parent2c98861fb01578139b77030006e1f50ea8f2680c (diff)
parentafbdd706fdd0b74a4946819c5a86388d5d1e0827 (diff)
downloadlinhes_pkgbuild-8448ed83b324ae637b425e4aa171563c087075d8.zip
linhes_pkgbuild-8448ed83b324ae637b425e4aa171563c087075d8.tar.gz
linhes_pkgbuild-8448ed83b324ae637b425e4aa171563c087075d8.tar.bz2
Merge remote branch 'origin/testing' into testing
-rw-r--r--abs/extra/recode/PKGBUILD15
-rw-r--r--abs/extra/recode/__changelog1
-rw-r--r--abs/extra/xbmc/PKGBUILD4
-rw-r--r--abs/extra/xbmc/__changelog1
4 files changed, 12 insertions, 9 deletions
diff --git a/abs/extra/recode/PKGBUILD b/abs/extra/recode/PKGBUILD
index f7fd237..af65e17 100644
--- a/abs/extra/recode/PKGBUILD
+++ b/abs/extra/recode/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=recode
pkgver=3.6
-pkgrel=5
+pkgrel=6
pkgdesc="Converts files between various character sets and usages"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/recode/recode.html"
@@ -11,16 +11,13 @@ license=('GPL' 'LGPL')
depends=('glibc' 'texinfo')
options=('!libtool')
install=recode.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+#source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.knoppmyth.net/R6/sources/pinard-Recode-v3.6-0-g2127b34.tar.gz
http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz
recode-3.6-as-if.patch recode-3.6-gettextfix.diff)
-md5sums=('be3f40ad2e93dae5cd5f628264bf1877'
- '95ca772e367a7ef56d3f46d724b6f86e'
- 'fca7484ba332c8ad59eb02334883cd92'
- 'eb602e80a24b5448604bfebeacc55304')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${srcdir}/pinard-Recode-2127b34
patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
patch -Np1 -i ${srcdir}/recode_3.6-15.diff
@@ -35,3 +32,7 @@ build() {
rm ${pkgdir}/usr/share/info/dir
gzip ${pkgdir}/usr/share/info/*
}
+md5sums=('f82e9a6ede9119268c13493c9add2809'
+ '95ca772e367a7ef56d3f46d724b6f86e'
+ 'fca7484ba332c8ad59eb02334883cd92'
+ 'eb602e80a24b5448604bfebeacc55304')
diff --git a/abs/extra/recode/__changelog b/abs/extra/recode/__changelog
new file mode 100644
index 0000000..af8fbcb
--- /dev/null
+++ b/abs/extra/recode/__changelog
@@ -0,0 +1 @@
+1/2/11 - chw - fixed URL for source
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index c8a3c44..13ca0c9 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -11,7 +11,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=10.0
-pkgrel=2
+pkgrel=3
pkgdesc="XBMC Media Center"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -20,7 +20,7 @@ depends=( 'bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
'glew' 'jasper' 'libcdio' 'libgl' 'libmad' 'libmms'
'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
- 'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd'
+ 'smbclient' 'wavpack' 'mesa' 'xorg-utils' 'libmicrohttpd'
'libssh' 'libva' 'libmodplug' 'rtmpdump')
if [ "$_ext_python" != "disable" ]; then
depends=( '${depends[@]}' 'python2' )
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
new file mode 100644
index 0000000..b2533c9
--- /dev/null
+++ b/abs/extra/xbmc/__changelog
@@ -0,0 +1 @@
+1/2/11 - chw - change mesa-demo dep to just mesa (since we are still on 7.9).