summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/calibre/PKGBUILD8
-rw-r--r--community/calibre/desktop_integration.patch6
-rw-r--r--community/camlp5-transitional/PKGBUILD47
-rw-r--r--community/camlp5/PKGBUILD62
-rw-r--r--community/compizconfig-backend-kconfig/PKGBUILD34
-rw-r--r--community/dosbox/PKGBUILD37
-rw-r--r--community/dosbox/gcc46.patch12
-rw-r--r--community/ginac/PKGBUILD15
-rw-r--r--community/gnofract4d/PKGBUILD18
-rw-r--r--community/intel-tbb/PKGBUILD6
-rw-r--r--community/libtrash/PKGBUILD35
-rw-r--r--community/libtrash/libtrash.install15
-rw-r--r--community/libtrash/libtrash.patch11
-rw-r--r--community/libtrash/libtrash.sh3
-rw-r--r--community/mediastreamer/PKGBUILD25
-rw-r--r--community/mediastreamer/disable-v4l1.patch50
-rw-r--r--community/mediatomb/PKGBUILD15
-rw-r--r--community/mediatomb/gcc46.patch10
-rw-r--r--community/mongodb/PKGBUILD24
-rw-r--r--community/mongodb/gcc46fixes.diff132
-rw-r--r--community/mongodb/gcc46fixes2.diff26
-rw-r--r--community/python-pycurl/PKGBUILD22
-rw-r--r--community/sfml/use-system-libs.patch70
-rw-r--r--community/synfigstudio/images-makefile.patch49
24 files changed, 124 insertions, 608 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 14ae58ba1..cb05d8e31 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $
+# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Petrov Roman <nwhisper@gmail.com>
# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
pkgname=calibre
-pkgver=0.8.5
+pkgver=0.8.6
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@ optdepends=('ipython: to use calibre-debug')
install=calibre.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
desktop_integration.patch)
-md5sums=('b6b07a35afe4dbf188f42e932536cca3'
- 'f4b80e3b34e34bce68b3f052ff52dee8')
+md5sums=('859d856bdcbd12189ffb91c581928ed9'
+ '253ce4fe5d01f8ff76b63cd3825755ea')
build() {
cd "${srcdir}/${pkgname}"
diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch
index 40d48c03e..4dbf53757 100644
--- a/community/calibre/desktop_integration.patch
+++ b/community/calibre/desktop_integration.patch
@@ -1,6 +1,6 @@
---- a/src/calibre/linux.py 2011-05-27 18:42:14.000000000 +0200
-+++ b/src/calibre/linux.py 2011-05-29 14:57:49.000000000 +0200
-@@ -340,51 +340,39 @@
+--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200
++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200
+@@ -339,51 +339,39 @@
with TemporaryDirectory() as tdir:
with CurrentDir(tdir):
diff --git a/community/camlp5-transitional/PKGBUILD b/community/camlp5-transitional/PKGBUILD
deleted file mode 100644
index 12cc3ac16..000000000
--- a/community/camlp5-transitional/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: George Giorgidze <giorgidze@gmail.com>
-# Contributor: Massimiliano Brocchini <brocchini@netseven.it>
-
-pkgname=camlp5-transitional
-pkgver=6.02.2
-pkgrel=1
-pkgdesc='Camlp5 is a preprocessor-pretty-printer of OCaml.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://pauillac.inria.fr/~ddr/camlp5/'
-license=('BSD')
-depends=('sh')
-makedepends=('ocaml')
-conflicts=('camlp5')
-options=('!makeflags')
-source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz"
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3')
-md5sums=('b495bf26355451186c6725ee01add0da'
- '3acab547f3c0acb3c09d1d707e6c5ee3'
- '2e911c01e7da967bf68deee13e9712c8'
- '6fa59ec7c684919b6c8e2eb2bcabcf93')
-
-build() {
- cd camlp5-${pkgver}
-
- patch -Np0 -i ${srcdir}/patch-6.02.2-1
- patch -Np0 -i ${srcdir}/patch-6.02.2-2
- patch -Np0 -i ${srcdir}/patch-6.02.2-3
-
- ./configure \
- -prefix '/usr' \
- -mandir '/usr/share/man' \
- -transitional
-
- make world.opt
-}
-
-package() {
- cd camlp5-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- install -D -m644 LICENSE \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD
index 2a6d069f7..348a197d0 100644
--- a/community/camlp5/PKGBUILD
+++ b/community/camlp5/PKGBUILD
@@ -1,46 +1,62 @@
# Maintainer: Thomas Dziedzic < gostrc at gmail >
# Contributor: Nathan Owe <ndowens.aur at gmail dot com>
+# Contributor: George Giorgidze <giorgidze@gmail.com>
+# Contributor: Massimiliano Brocchini <brocchini@netseven.it>
-pkgname=camlp5
-pkgver=6.02.2
+pkgname=('camlp5' 'camlp5-transitional')
+pkgver=6.02.3
pkgrel=1
-pkgdesc='A preprocessor-pretty-printer of OCaml.'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
url='http://pauillac.inria.fr/~ddr/camlp5/'
license=('BSD')
depends=('sh')
makedepends=('ocaml')
-conflicts=('camlp5-transitional')
options=('!makeflags')
-source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${pkgname}-${pkgver}.tgz"
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2'
- 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3')
-md5sums=('b495bf26355451186c6725ee01add0da'
- '3acab547f3c0acb3c09d1d707e6c5ee3'
- '2e911c01e7da967bf68deee13e9712c8'
- '6fa59ec7c684919b6c8e2eb2bcabcf93')
+source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz")
+md5sums=('a4f5e0dc13c43d50eb655c8e929f556e')
build() {
- cd ${pkgname}-${pkgver}
+ cp -r camlp5-${pkgver} camlp5-transitional-${pkgver}
- patch -Np0 -i ${srcdir}/patch-6.02.2-1
- patch -Np0 -i ${srcdir}/patch-6.02.2-2
- patch -Np0 -i ${srcdir}/patch-6.02.2-3
+ cd ${srcdir}/camlp5-${pkgver}
./configure \
-prefix '/usr' \
-mandir '/usr/share/man' \
- -strict
+ -strict
- make world.opt
+ make world.opt
+
+ cd ${srcdir}/camlp5-transitional-${pkgver}
+
+ ./configure \
+ -prefix '/usr' \
+ -mandir '/usr/share/man' \
+ -transitional
+
+ make world.opt
}
-package() {
- cd ${pkgname}-${pkgver}
+package_camlp5() {
+ pkgdesc='A preprocessor-pretty-printer of OCaml.'
+ conflicts=('camlp5-transitional')
+
+ cd camlp5-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+
+ install -D -m644 LICENSE \
+ ${pkgdir}/usr/share/licenses/camlp5/LICENSE
+}
+
+package_camlp5-transitional() {
+ pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)'
+ conflicts=('camlp5')
+
+ cd camlp5-transitional-${pkgver}
- make DESTDIR=${pkgdir} install
+ make DESTDIR=${pkgdir} install
install -D -m644 LICENSE \
- ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ ${pkgdir}/usr/share/licenses/camlp5-transitional/LICENSE
}
diff --git a/community/compizconfig-backend-kconfig/PKGBUILD b/community/compizconfig-backend-kconfig/PKGBUILD
deleted file mode 100644
index 49813cc10..000000000
--- a/community/compizconfig-backend-kconfig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 4448 2009-10-23 09:02:36Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-# Contributor: kasa <biuta.jr@gmail.com>
-
-pkgname=compizconfig-backend-kconfig
-pkgver=0.8.4
-pkgrel=1
-pkgdesc="Compizconfig backend for kconfig"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://opencompositing.org"
-license=('GPL')
-depends=('libcompizconfig' 'kdelibs3' 'qt3')
-makedepends=('intltool' 'pkgconfig')
-conflicts=('compizconfig-backend-gconf-git')
-groups=('compiz-fusion-kde' 'compiz-fusion')
-options=('!libtool')
-source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a96a30aba5e5faf7aa7db440fe4891ca')
-
-build() {
- source /etc/profile.d/kde3.sh
- source /etc/profile.d/qt3.sh
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure \
- --prefix=/opt/kde \
- --without-arts \
- --with-kde-includes=/opt/kde/includes
-
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-
-}
-
diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
index 4358f1a53..1f88ecec8 100644
--- a/community/dosbox/PKGBUILD
+++ b/community/dosbox/PKGBUILD
@@ -1,37 +1,46 @@
-# $Id: PKGBUILD 46953 2011-05-13 20:41:08Z andrea $
+# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $
# Maintainer :
+# Contribute : Jelle van der Waa <jelle@vdwaa.nl>
# Contributor: James Rayner <james@archlinux.org>
# Contributor: Ben <ben@benmazer.net>
pkgname=dosbox
pkgver=0.74
-pkgrel=1
+pkgrel=2
pkgdesc="An emulator with builtin DOS for running DOS Games"
arch=('i686' 'x86_64')
url="http://dosbox.sourceforge.net/"
license=('GPL')
-depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
+depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
makedepends=('mesa')
source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
- 'dosbox.png' 'dosbox.desktop')
-md5sums=('b9b240fa87104421962d14eee71351e8'
- '2aac25fc06979e375953fcc36824dc5e'
- '85169ca599028bee8e29e0b3b7b34dd8')
+ 'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
build(){
cd ${srcdir}/${pkgname}-${pkgver}
- sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1
- ./configure --prefix=/usr \
- --sysconfdir=/etc/dosbox || return 1
- make || return 1
+ patch -Np1 -i $srcdir/gcc46.patch
+ sed -i 's/png_check_sig/png_sig_cmp/' configure
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc/dosbox
+ make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install
+
+
+ # install docs, make does not install them
+ install -d $pkgdir/usr/share/doc/$pkgname
+ install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+ install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video
install -Dm644 ${srcdir}/${pkgname}.png \
- ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1
+ ${pkgdir}/usr/share/pixmaps/${pkgname}.png
install -Dm644 ${srcdir}/${pkgname}.desktop \
- ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
+ ${pkgdir}/usr/share/applications/${pkgname}.desktop
}
+md5sums=('b9b240fa87104421962d14eee71351e8'
+ '2aac25fc06979e375953fcc36824dc5e'
+ '85169ca599028bee8e29e0b3b7b34dd8'
+ '3fba2e3c7c43290319b2928f40ed30e5')
diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch
new file mode 100644
index 000000000..eae9ae63e
--- /dev/null
+++ b/community/dosbox/gcc46.patch
@@ -0,0 +1,12 @@
+diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
+--- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000
++++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000
+@@ -28,6 +28,8 @@
+ #include "mem.h"
+ #endif
+
++#include <stddef.h> //for offsetof
++
+ #ifdef _MSC_VER
+ #pragma pack (1)
+ #endif
diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD
index ea833edc6..e2a1ec1af 100644
--- a/community/ginac/PKGBUILD
+++ b/community/ginac/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 38846 2011-02-02 01:49:37Z ebelanger $
# Maintainer: Thomas Dziedzic < gostrc at gmail >
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=ginac
-pkgver=1.5.8
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ginac.de'
@@ -12,11 +11,11 @@ license=('GPL')
depends=('cln')
makedepends=('transfig')
options=('!libtool')
-source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8693b3c9c3467694032ce9c8b3063d4c')
+source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2")
+md5sums=('6d1385b440c00705a368ad51d60a292d')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ginac-${pkgver}
./configure \
--prefix=/usr
@@ -27,7 +26,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ginac-${pkgver}
- make DESTDIR="${pkgdir}" install
+ make DESTDIR=${pkgdir} install
}
diff --git a/community/gnofract4d/PKGBUILD b/community/gnofract4d/PKGBUILD
index 710c25735..b29cf52b1 100644
--- a/community/gnofract4d/PKGBUILD
+++ b/community/gnofract4d/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
pkgname=gnofract4d
-pkgver=3.13
-pkgrel=2
+pkgver=3.14
+pkgrel=1
pkgdesc='A fractal browser with PyGTK gui'
arch=('i686' 'x86_64' 'mips64el')
url='http://gnofract4d.sourceforge.net'
@@ -11,24 +11,20 @@ license=('custom')
depends=('pygtk' 'libjpeg' 'libpng' 'shared-mime-info')
options=('!strip')
install='gnofract4d.install'
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'imageIO.cpp.patch')
-md5sums=('d739eb0a61bc518ada8f5b8952298166'
- 'ff29a621a27a3836de211c577f6ab9a4')
+source=("http://downloads.sourceforge.net/sourceforge/gnofract4d/gnofract4d-${pkgver}.tar.gz")
+md5sums=('5c4956ff9aed37b5ad8b984e3673937d')
build() {
- cd ${pkgname}-${pkgver}
-
- patch -p0 < ${srcdir}/imageIO.cpp.patch
+ cd gnofract4d-${pkgver}
python2 setup.py build
}
package() {
- cd ${pkgname}-${pkgver}
+ cd gnofract4d-${pkgver}
python2 setup.py install --root=${pkgdir} --optimize=1
install -D -m644 COPYING \
- ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+ ${pkgdir}/usr/share/licenses/gnofract4d/COPYING
}
diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD
index 14e589d8e..add437082 100644
--- a/community/intel-tbb/PKGBUILD
+++ b/community/intel-tbb/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: Denis Martinez <deuns.martinez AT gmail.com>
pkgname=intel-tbb
-pkgver=3.0_20101215
+pkgver=3.0_20110427
pkgrel=1
pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.threadingbuildingblocks.org/'
license=('GPL')
-source=("http://www.threadingbuildingblocks.org/uploads/77/164/3.0%20Update%205/tbb30_20101215oss_src.tgz")
-md5sums=('d1f65b7ba8bafda5a8616dfc8159ea05')
+source=("http://threadingbuildingblocks.org/uploads/77/171/3.0%20update%207/tbb30_20110427oss_src.tgz")
+md5sums=('ba406f4767592179e7930e790036f00a')
build() {
cd tbb${pkgver/\./}oss
diff --git a/community/libtrash/PKGBUILD b/community/libtrash/PKGBUILD
deleted file mode 100644
index f6abf71ca..000000000
--- a/community/libtrash/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 24969 2010-08-29 20:08:31Z jlichtblau $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libtrash
-pkgver=3.2
-pkgrel=2
-pkgdesc="A shared, preloaded library that implements a trash can under Linux"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
-license=('GPL')
-depends=('glibc')
-makedepends=('patch' 'python')
-install=$pkgname.install
-source=(http://pages.stern.nyu.edu/~marriaga/software/libtrash/$pkgname-latest.tgz libtrash.patch libtrash.sh)
-md5sums=('147f645738088c83738259376737bc42'
- '662e030819f2954b59e7646c77855f6c'
- 'de716ae481adc8e88ddd32ea72808230')
-
-build() {
- cd ${srcdir}/$pkgname-$pkgver
-
- patch -Np1 -i $startdir/src/libtrash.patch
-
- install -d ${pkgdir}/usr/lib ${pkgdir}/etc/profile.d
- make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc
-}
-
-package() {
- cd ${srcdir}/$pkgname-$pkgver
-
- make INSTLIBDIR=${pkgdir}/usr/lib SYSCONFFILE=${pkgdir}/etc install
- install -D -m 644 ${srcdir}/libtrash.sh ${pkgdir}/etc/profile.d/libtrash.sh
-}
diff --git a/community/libtrash/libtrash.install b/community/libtrash/libtrash.install
deleted file mode 100644
index 9b1d1db9d..000000000
--- a/community/libtrash/libtrash.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo ">> To enable libtrash at login:"
- echo ">> chmod 755 /etc/profile.d/libtrash.sh"
- echo ">> To enable libtrash at any moment:"
- echo ">> . /etc/profile.d/libtrash.sh"
- echo ">> To disable libtrash at any moment:"
- echo ">> unset LD_PRELOAD"
- echo ">> WARNING: fakeroot will not work while libtrash is enabled."
- echo ">> Disable libtrash before using fakeroot!"
-}
-
-post_upgrade() {
- post_install
-}
-
diff --git a/community/libtrash/libtrash.patch b/community/libtrash/libtrash.patch
deleted file mode 100644
index df08f9174..000000000
--- a/community/libtrash/libtrash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN libtrash-2.1/src/Makefile libtrash-2.1-new/src/Makefile
---- libtrash-2.1/src/Makefile 2003-06-24 16:35:25.000000000 -0700
-+++ libtrash-2.1-new/src/Makefile 2003-07-13 01:35:35.000000000 -0700
-@@ -29,7 +29,6 @@
- TRASH_OFF=YES install libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so.${VERSION}
- TRASH_OFF=YES ln -sf libtrash.so.${VERSION} ${INSTLIBDIR}/libtrash.so
- TRASH_OFF=YES install libtrash.conf.sys --mode a=r ${SYSCONFFILE}
-- ldconfig
-
- clean:
- rm -f *~
diff --git a/community/libtrash/libtrash.sh b/community/libtrash/libtrash.sh
deleted file mode 100644
index d2850a56e..000000000
--- a/community/libtrash/libtrash.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-export LD_PRELOAD=/usr/lib/libtrash.so.3.2
diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD
deleted file mode 100644
index cc81012ba..000000000
--- a/community/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 44001 2011-04-01 15:25:02Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.7.3
-pkgrel=1
-pkgdesc="A library written in C that allows you to create and run audio and video streams."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.linphone.org"
-license=('GPL')
-depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz"
- "disable-v4l1.patch")
-md5sums=('5213307f557d86aa648f1a53a885138c'
- '7ee15689eed1adbdcf0ddab8fadca34a')
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver/
- patch -p2 <$srcdir/disable-v4l1.patch
- ./configure --prefix=/usr
- make
- make DESTDIR=${pkgdir} install
-}
diff --git a/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/community/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
-
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
-
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
-- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
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
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 3e20e38ea..fe2cac7f9 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Alec Thomas
pkgname=mongodb
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.8.2
+pkgrel=1
pkgdesc='A high-performance, open source, schema-free document-oriented database.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.mongodb.org'
@@ -16,25 +16,15 @@ backup=('etc/mongodb.conf')
install="mongodb.install"
source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
'mongodb.rc'
- 'mongodb.conf'
- 'gcc46fixes.diff'
- 'gcc46fixes2.diff')
-md5sums=('e75a5cae641a53760df8cb866ad5d929'
+ 'mongodb.conf')
+md5sums=('951fb1a75d90fc822cf4528585a970cf'
'859f8f9bb32ef2bd21fec55ae9a87d0a'
- '9e0ea3f96732bb7811f0b64dace56440'
- 'e90c78350e25df2d24f98e4767677d4b'
- '5097de6ce2c347c3703ab8cf5a611052')
+ '9e0ea3f96732bb7811f0b64dace56440')
build() {
export SCONSFLAGS="$MAKEFLAGS"
- cd ${pkgname}-src-r${pkgver}
-
- patch -Np1 -i ${srcdir}/gcc46fixes.diff
- patch -Np1 -i ${srcdir}/gcc46fixes2.diff
-
- # scons is "special"
- sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct
+ cd mongodb-src-r${pkgver}
scons \
all \
@@ -42,7 +32,7 @@ build() {
}
package() {
- cd ${pkgname}-src-r${pkgver}
+ cd mongodb-src-r${pkgver}
scons \
install \
diff --git a/community/mongodb/gcc46fixes.diff b/community/mongodb/gcc46fixes.diff
deleted file mode 100644
index 487c88f16..000000000
--- a/community/mongodb/gcc46fixes.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-commit fa7cd65e480d80ba1cd196bdcec8f4714e361e8e
-Author: Mathias Stearn <redbeard0531@gmail.com>
-Date: Sun Apr 3 19:10:36 2011 -0400
-
- g++ 4.6 compile (new -Wunused-but-set-variable warning)
-
-diff --git a/db/btree.cpp b/db/btree.cpp
-index 2758f72..4162d6a 100644
---- a/db/btree.cpp
-+++ b/db/btree.cpp
-@@ -1226,8 +1226,6 @@ namespace mongo {
- out() << " " << thisLoc.toString() << ".insertHere " << key.toString() << '/' << recordLoc.toString() << ' '
- << lchild.toString() << ' ' << rchild.toString() << " keypos:" << keypos << endl;
-
-- DiskLoc oldLoc = thisLoc;
--
- if ( !basicInsert(thisLoc, keypos, recordLoc, key, order) ) {
- // If basicInsert() fails, the bucket will be packed as required by split().
- thisLoc.btreemod()->split(thisLoc, keypos, recordLoc, key, order, lchild, rchild, idx);
-diff --git a/db/dbcommands.cpp b/db/dbcommands.cpp
-index 2580f86..56c0fce 100644
---- a/db/dbcommands.cpp
-+++ b/db/dbcommands.cpp
-@@ -1460,7 +1460,7 @@ namespace mongo {
- uassert( 13049, "godinsert must specify a collection", !coll.empty() );
- string ns = dbname + "." + coll;
- BSONObj obj = cmdObj[ "obj" ].embeddedObjectUserCheck();
-- DiskLoc loc = theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true );
-+ theDataFileMgr.insertWithObjMod( ns.c_str(), obj, true );
- return true;
- }
- } cmdGodInsert;
-diff --git a/db/index.cpp b/db/index.cpp
-index c696e27..218ecb3 100644
---- a/db/index.cpp
-+++ b/db/index.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
- void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj, bool &changedId) {
- int z = d.nIndexesBeingBuilt();
- v.resize(z);
-- NamespaceDetails::IndexIterator i = d.ii();
- for( int i = 0; i < z; i++ ) {
- IndexDetails& idx = d.idx(i);
- BSONObj idxKey = idx.info.obj().getObjectField("key"); // eg { ts : 1 }
-diff --git a/db/update.cpp b/db/update.cpp
-index e173902..85c3f9c 100644
---- a/db/update.cpp
-+++ b/db/update.cpp
-@@ -992,7 +992,7 @@ namespace mongo {
- BSONObj newObj = mss->createNewFromMods();
- checkTooLarge(newObj);
- assert(nsdt);
-- DiskLoc newLoc = theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug);
-+ theDataFileMgr.updateRecord(ns, d, nsdt, r, loc , newObj.objdata(), newObj.objsize(), debug);
- }
-
- if ( logop ) {
-diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp
-index acf9217..2d6f752 100644
---- a/dbtests/queryoptimizertests.cpp
-+++ b/dbtests/queryoptimizertests.cpp
-@@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests {
- theDataFileMgr.insertWithObjMod( ns(), temp );
- }
- BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" );
-- BSONElement hintElt = hint.firstElement();
- auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) );
- QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() );
- boost::shared_ptr<Cursor> c = qp.newCursor();
-@@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests {
- theDataFileMgr.insertWithObjMod( ns(), temp );
- }
- BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" );
-- BSONElement hintElt = hint.firstElement();
- auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) );
- QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() );
- boost::shared_ptr<Cursor> c = qp.newCursor();
-diff --git a/shell/shell_utils.cpp b/shell/shell_utils.cpp
-index 6c398ef..53484fd 100644
---- a/shell/shell_utils.cpp
-+++ b/shell/shell_utils.cpp
-@@ -260,7 +260,7 @@ namespace mongo {
- BSONElement e = oneArg(args);
- bool found = false;
-
-- path root( args.firstElement().valuestrsafe() );
-+ path root( e.valuestrsafe() );
- if ( boost::filesystem::exists( root ) ) {
- found = true;
- boost::filesystem::remove_all( root );
-diff --git a/tools/tool.cpp b/tools/tool.cpp
-index 92a4bd4..150481b 100644
---- a/tools/tool.cpp
-+++ b/tools/tool.cpp
-@@ -413,14 +413,14 @@ namespace mongo {
- ProgressMeter m( fileLength );
-
- while ( read < fileLength ) {
-- int readlen = fread(buf, 4, 1, file);
-+ fread(buf, 4, 1, file);
- int size = ((int*)buf)[0];
- if ( size >= BUF_SIZE ) {
- cerr << "got an object of size: " << size << " terminating..." << endl;
- }
- uassert( 10264 , "invalid object size" , size < BUF_SIZE );
-
-- readlen = fread(buf+4, size-4, 1, file);
-+ fread(buf+4, size-4, 1, file);
-
- BSONObj o( buf );
- if ( _objcheck && ! o.valid() ) {
-diff --git a/util/ramlog.h b/util/ramlog.h
-index fc588e6..b2f3aa0 100644
---- a/util/ramlog.h
-+++ b/util/ramlog.h
-@@ -108,7 +108,6 @@ namespace mongo {
- vector<const char*> v;
- get( v );
-
-- bool first = true;
- s << "<pre>\n";
- for( int i = 0; i < (int)v.size(); i++ ) {
- assert( strlen(v[i]) > 20 );
-@@ -126,7 +125,7 @@ namespace mongo {
- stringstream r;
- if( nr == 1 ) r << "repeat last line";
- else r << "repeats last " << nr << " lines; ends " << string(v[last]+4,0,15);
-- first = false; s << html::a("", r.str(), clean(v,i,x.str()));
-+ s << html::a("", r.str(), clean(v,i,x.str()));
- }
- else s << x.str();
- s << '\n';
diff --git a/community/mongodb/gcc46fixes2.diff b/community/mongodb/gcc46fixes2.diff
deleted file mode 100644
index 17257b136..000000000
--- a/community/mongodb/gcc46fixes2.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5931bc0231c91ecdfc5dd313d8cce578eae426bb
-Author: Eliot Horowitz <eliot@10gen.com>
-Date: Wed Mar 30 01:01:18 2011 -0400
-
- remove unused variable
-
-diff --git a/db/commands.cpp b/db/commands.cpp
-index c301fb3..0bbd765 100644
---- a/db/commands.cpp
-+++ b/db/commands.cpp
-@@ -127,7 +127,6 @@ namespace mongo {
- if ( strcmp(p, ".$cmd") != 0 ) return false;
-
- bool ok = false;
-- bool valid = false;
-
- BSONElement e = jsobj.firstElement();
- map<string,Command*>::iterator i;
-@@ -138,7 +137,6 @@ namespace mongo {
- migrated over to the command object format.
- */
- else if ( (i = _commands->find(e.fieldName())) != _commands->end() ) {
-- valid = true;
- string errmsg;
- Command *c = i->second;
- if ( c->adminOnly() && !startsWith(ns, "admin.") ) {
diff --git a/community/python-pycurl/PKGBUILD b/community/python-pycurl/PKGBUILD
deleted file mode 100644
index 55c5f9284..000000000
--- a/community/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: kontrast <kontr4st@gmail.com>
-
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=5
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python2' 'curl')
-replaces=('pycurl')
-provides=('pycurl')
-source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-package() {
- cd ${srcdir}/pycurl-${pkgver}
- python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
-}
diff --git a/community/sfml/use-system-libs.patch b/community/sfml/use-system-libs.patch
deleted file mode 100644
index 5d3200225..000000000
--- a/community/sfml/use-system-libs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6
-Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ
-Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ
-Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ
-diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
---- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100
-+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200
-@@ -28,10 +28,10 @@
- #include <SFML/Graphics/ImageLoader.hpp>
- extern "C"
- {
-- #include <SFML/Graphics/libjpeg/jpeglib.h>
-- #include <SFML/Graphics/libjpeg/jerror.h>
-+ #include <jpeglib.h>
-+ #include <jerror.h>
- }
--#include <SFML/Graphics/libpng/png.h>
-+#include <png.h>
- #include <SFML/Graphics/SOIL/SOIL.h>
- #include <iostream>
-
-Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej
-diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile
---- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100
-+++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200
-@@ -1,15 +1,5 @@
- SRC = $(wildcard *.cpp)
--SRCGLEW = $(wildcard ./GLEW/*.c)
--SRCJPEG = $(wildcard ./libjpeg/*.c)
--SRCPNG = $(wildcard ./libpng/*.c)
--SRCSOIL = $(wildcard ./SOIL/*.c)
--SRCZLIB = $(wildcard ./zlib/*.c)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
--OBJJPEG = $(SRCJPEG:.c=.o)
--OBJPNG = $(SRCPNG:.c=.o)
--OBJSOIL = $(SRCSOIL:.c=.o)
--OBJZLIB = $(SRCZLIB:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-graphics-s.a
-@@ -23,22 +13,19 @@
-
- all: $(LIB)
-
--libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+libsfml-graphics-s.a: $(OBJ)
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
--
- .PHONY: clean mrproper
-
- clean:
-- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+ @rm -rf $(OBJ)
-
- mrproper: clean
- @rm -rf $(LIBNAME)
-Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej
diff --git a/community/synfigstudio/images-makefile.patch b/community/synfigstudio/images-makefile.patch
deleted file mode 100644
index cb209b40e..000000000
--- a/community/synfigstudio/images-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- images-old/Makefile 2008-10-22 23:16:32.000000000 -0700
-+++ images/Makefile 2008-10-22 23:15:16.000000000 -0700
-@@ -223,7 +223,7 @@
- top_builddir = ..
- top_srcdir = ..
- SYNFIG = synfig
--EXT = png
-+EXT = mng
- EXTRA_DIST = installer_logo.sif installer_logo_osx.sif \
- splash_screen.sifz splash_screen-0.61.08.sif \
- splash_screen-0.61.07.sif about_icon.sif angle_icon.sif \
-@@ -650,31 +650,37 @@
- $(SYNFIG) -q $< -o $@ --time 0
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- .sifz.$(EXT):
- $(SYNFIG) -q $< -o $@ --time 0
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_past.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0 -c PastOnly
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_future.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0 -c FutureOnly
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif
- $(SYNFIG) -q $< -o $@ --time 0 -c Disabled
- echo " File \"images\\$@\"" >>./images.nsh
- echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
-+ mogrify -format png $@
-
- #.sif.png:
- # $(SYNFIG) -q $< -o $@ --time 0
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-26 17:04:55 +0000