diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
| commit | 8a79dffbc1b5f55765698c420217bb06f67bb684 (patch) | |
| tree | 8f8b0ee50fcd68c6572d7e7f8ce26150ac1dd430 /community/mediatomb | |
| parent | 35d3377392b5d0678453096f87df70faf87f72c6 (diff) | |
| parent | 5457eacc747fc3f91e10a1f452230b1feac39eff (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5-transitional/PKGBUILD
community/camlp5/PKGBUILD
community/compizconfig-backend-kconfig/PKGBUILD
community/libtrash/PKGBUILD
community/mediastreamer/PKGBUILD
community/python-pycurl/PKGBUILD
extra/alpine/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/aufs2-util/PKGBUILD
extra/bitlbee/PKGBUILD
extra/cups/PKGBUILD
extra/dotconf/PKGBUILD
extra/fbida/PKGBUILD
extra/fvwm-devel/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libindi/PKGBUILD
extra/mousepad/PKGBUILD
extra/pysmbc/PKGBUILD
extra/rcs/PKGBUILD
extra/xfprint/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/cindexer-clang-path.patch
multilib/lib32-llvm/clang-plugin-loader-registry.patch
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
Diffstat (limited to 'community/mediatomb')
| -rw-r--r-- | community/mediatomb/PKGBUILD | 15 | ||||
| -rw-r--r-- | community/mediatomb/gcc46.patch | 10 |
2 files changed, 19 insertions, 6 deletions
diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD index f04da8eb5..f0801b70e 100644 --- a/community/mediatomb/PKGBUILD +++ b/community/mediatomb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 36085 2010-12-27 00:44:09Z jconder $ +# $Id: PKGBUILD 49488 2011-06-17 21:55:59Z jelle $ # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Nikhil Bysani <nikron@gmail.com> # Contributor: Mika Hynnä <igheax@gmail.com> @@ -6,23 +6,26 @@ pkgname=mediatomb pkgver=0.12.1 -pkgrel=3 +pkgrel=4 pkgdesc="Free UPnP/DLNA media server" arch=('i686' 'x86_64' 'mips64el') url="http://mediatomb.cc/" license=('GPL') -depends=('libexif' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer') +depends=('libexif' 'libmp4v2' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer') backup=('etc/conf.d/mediatomb') install=mediatomb.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'mediatomb.rc' - 'mediatomb.conf') + 'mediatomb.conf' + 'gcc46.patch') md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' 'aa1191ec508d8bd4b3b9a5fe48efc079' - 'bec297e4178332a26b42bbde873b94cd') + 'bec297e4178332a26b42bbde873b94cd' + '0ae34c0d73b76e3d215887834c3c08cf') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gcc46.patch ./configure --prefix=/usr \ --disable-mysql \ @@ -39,5 +42,5 @@ package() { install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" - mkdir -p "$pkgdir/var/lib/mediatomb" + install -d "$pkgdir/var/lib/mediatomb" } diff --git a/community/mediatomb/gcc46.patch b/community/mediatomb/gcc46.patch new file mode 100644 index 000000000..0f4fe490f --- /dev/null +++ b/community/mediatomb/gcc46.patch @@ -0,0 +1,10 @@ +--- a/src/zmm/object.h ++++ b/src/zmm/object.h +@@ -33,6 +33,7 @@ + #define __ZMM_OBJECT_H__ + + #include <new> // for size_t ++#include <cstddef> + #include "atomic.h" + + namespace zmm |