diff options
33 files changed, 1013 insertions, 133 deletions
diff --git a/community-staging/ffmpeg-compat/PKGBUILD b/community-staging/ffmpeg-compat/PKGBUILD new file mode 100644 index 000000000..19336feeb --- /dev/null +++ b/community-staging/ffmpeg-compat/PKGBUILD @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=ffmpeg-compat +pkgver=20120509 +pkgrel=1 +pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" +arch=('i686' 'x86_64') +url="http://ffmpeg.org/" +license=('GPL') +depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) +makedepends=('yasm' 'git' 'libvdpau') +#git clone git://git.videolan.org/ffmpeg.git +source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz) +md5sums=('a35359e424608f369d380f03e4dc9966') + +build() { + cd "ffmpeg" + + ./configure \ + --prefix=/usr \ + --incdir=/usr/include/ffmpeg-compat \ + --libdir=/usr/lib/ffmpeg-compat \ + --shlibdir=/usr/lib/ffmpeg-compat \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libpulse \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --disable-static + + make +} + +package() { + cd "ffmpeg" + make DESTDIR="$pkgdir" install + rm -rf $pkgdir/usr/{bin,share} +} diff --git a/community-staging/motion/PKGBUILD b/community-staging/motion/PKGBUILD index 8387624c0..00edf7064 100644 --- a/community-staging/motion/PKGBUILD +++ b/community-staging/motion/PKGBUILD @@ -1,75 +1,39 @@ -# $Id: PKGBUILD 72669 2012-06-18 22:08:51Z spupykin $ +# $Id: PKGBUILD 72698 2012-06-20 10:30:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=5 +pkgrel=6 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64') license=('GPL') url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -depends=('libjpeg' 'v4l-utils') - -# ffmpeg workaround -depends=(${depends[@]} speex libpulse bzip2 lame xvidcore opencore-amr libvpx libva sdl openjpeg rtmpdump gsm schroedinger libtheora x264) -makedepends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg - rtmpdump schroedinger sdl speex x264 xvidcore zlib yasm libvdpau) - +depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat') backup=('etc/motion/motion.conf') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch - ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-20120509.tar.xz) + ffmpeg-compat.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' '2e8c53c4980edddd420f08fdd572c9be' 'd36687710837d69fbce4608b1345fa34' 'd8c3c4fdded5cfbd729710475559a21d' - 'a35359e424608f369d380f03e4dc9966') + 'e85c596292aceb425fcf17e5072e2fff') build() { - cd $srcdir/ffmpeg - ./configure \ - --prefix=$srcdir/ffmpeg \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --enable-static \ - --disable-shared - make - make install - - cd "${srcdir}/${pkgname}-${pkgver}" + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH patch -Np1 -i $srcdir/ffmpeg-0.8.patch patch -Np1 -i $srcdir/linux-headers.patch - - # ffmpeg workaround - export LDFLAGS="-ldl -lX11 -lXext -lXfixes -lva -lasound -lSDL -lpthread -lxvidcore -lx264 -lvpx -lvpx -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lspeex -lschroedinger-1.0 -lrtmp -lz -lssl -lcrypto -lpulse-simple -lpulse -lopenjpeg -lopencore-amrwb -lopencore-amrnb -lmp3lame -lgsm -lm -pthread -lbz2 -lz" - + patch -Np1 -i $srcdir/ffmpeg-compat.patch + autoreconf ./configure --prefix=/usr \ --without-pgsql \ --without-mysql \ --sysconfdir=/etc/motion \ - --with-ffmpeg=$srcdir/ffmpeg + --with-ffmpeg make } diff --git a/community-staging/motion/ffmpeg-compat.patch b/community-staging/motion/ffmpeg-compat.patch new file mode 100644 index 000000000..278166e18 --- /dev/null +++ b/community-staging/motion/ffmpeg-compat.patch @@ -0,0 +1,172 @@ +diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in +--- motion-3.2.12/configure.in 2010-06-01 10:48:23.000000000 +0400 ++++ motion-3.2.12.q/configure.in 2012-06-20 13:51:42.000000000 +0400 +@@ -290,163 +290,11 @@ + fi + + +-# +-# Check for libavcodec and libavformat from ffmpeg +-# +-FFMPEG_DIR="yes" +-FFMPEG_OK="no_found" +-FFMPEG_OBJ="" +-AC_ARG_WITH(ffmpeg, +-[ --with-ffmpeg[=DIR] Specify the prefix for the install path for +- libavcodec/libavformat (part of ffmpeg) be able to +- encode mpeg movies realtime. +- If this is not specified motion will try to find +- the libraries in /usr and /usr/local. +- ], +-FFMPEG_DIR="$withval" +-) +-# +-# --without-ffmpeg or with-ffmpeg=no +-# +-if test "${FFMPEG_DIR}" = "no"; then +- AC_MSG_CHECKING(for ffmpeg) +- AC_MSG_RESULT(skipping) +-# +-# with-ffmpeg=<dir> or nothing +-# +-else if test "${FFMPEG_DIR}" = "yes"; then +- # AUTODETECT STATIC/SHARED LIB +- AC_MSG_CHECKING(for ffmpeg autodetecting) +- +- if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then +- AC_MSG_RESULT(found in /usr/lib64) +- FFMPEG_OK="found" +- FFMPEG_LIB="/usr/lib64" +- FFMPEG_DIR="/usr" +- elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then +- AC_MSG_RESULT(found in /usr/lib) +- FFMPEG_OK="found" +- FFMPEG_LIB="/usr/lib" +- FFMPEG_DIR="/usr" +- elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then +- AC_MSG_RESULT(found in /usr/local/lib) +- FFMPEG_OK="found" +- FFMPEG_LIB="/usr/local/lib" +- FFMPEG_DIR="/usr/local" +- else +- AC_MSG_RESULT(not found) +- echo "" +- echo "**********************************************" +- echo "* libavcodec.a or libavcodec.so or *" +- echo "* libavformat.a or libavformat.so not found: *" +- echo "* ALL FFMPEG FEATURES DISABLED *" +- echo "* *" +- echo "* Please read the Motion Guide for help: *" +- echo "* http://motion.sourceforge.net *" +- echo "**********************************************" +- echo "" +- fi +-else +- AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-) +- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then +- AC_MSG_RESULT(found) +- FFMPEG_OK="found" +- FFMPEG_LIB="${FFMPEG_DIR}/lib" +- elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then +- AC_MSG_RESULT(found) +- FFMPEG_LIB="${FFMPEG_DIR}" +- FFMPEG_OK="found" +- else +- AC_MSG_RESULT(not found) +- if test "${FFMPEG_OK}" != "found"; then +- echo "" +- echo "**********************************************" +- echo "* libavcodec.a or libavcodec.so or *" +- echo "* libavformat.a or libavformat.so not found: *" +- echo "* ALL FFMPEG FEATURES DISABLED *" +- echo "* *" +- echo "* Please read the Motion Guide for help: *" +- echo "* http://motion.sourceforge.net *" +- echo "**********************************************" +- echo "" +- fi +- fi +-fi +- +-# +-# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found +-# +- +-if test "${FFMPEG_OK}" = "found"; then +- AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR}) +- +- if test -f ${FFMPEG_DIR}/include/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include" +- elif test -f ${FFMPEG_DIR}/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}" +- elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg" +- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" +- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then +- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h) +- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" +- else +- AC_MSG_RESULT(not found) +- FFMPEG_OK="no_found" +- echo "**********************************************" +- echo "* avformat.h not found: *" +- echo "* ALL FFMPEG FEATURES DISABLED *" +- echo "* *" +- echo "* Please read the Motion Guide for help: *" +- echo "* http://motion.sourceforge.net *" +- echo "**********************************************" +- echo "" +- fi +- +-# +-# If ffmpeg libs and headers have been found +-# +- +- if test "${FFMPEG_OK}" = "found"; then +- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz" +- TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}" +- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}" +- +- FFMPEG_OBJ="ffmpeg.o" +- AC_SUBST(FFMPEG_OBJ) +- +- AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?]) +- saved_CFLAGS=$CFLAGS +- saved_LIBS=$LIBS +- CFLAGS="${FFMPEG_CFLAGS}" +- LIBS="$TEMP_LIBS" +- +- AC_COMPILE_IFELSE( +- [ +- #include <avformat.h> +- URLProtocol test_file_protocol; +- int main(void){ +- test_file_protocol.url_read = file_protocol.url_read; +- return 0; +- } +- ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW" +- ] +- ) +- CFLAGS=$saved_CFLAGS +- LIBS=$saved_LIBS +- fi +-fi +-fi +- ++TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW" ++TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat" ++FFMPEG_OK=found ++FFMPEG_OBJ="ffmpeg.o" ++AC_SUBST(FFMPEG_OBJ) + + # + # Check Mysql diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD new file mode 100644 index 000000000..e9912ed4b --- /dev/null +++ b/community-staging/openscenegraph/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 72706 2012-06-20 12:38:43Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hans Janssen <janserv@gmail.com> +# Contributor: my64 <packages@obordes.com> +# Contributor: Colin Pitrat <colin.pitrat@gmail.com> + +pkgname=openscenegraph +pkgver=3.0.1 +pkgrel=6 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt') +conflicts=('openthreads') +provides=('openthreads') +source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip + osg-xine-1.2.patch) +#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") +md5sums=('c43a25d023e635c3566b2083d8e6d956' + 'b05a486fdc2aaf06b29efb5e0714672e') + +build() { + cd OpenSceneGraph-$pkgver + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" + [ $NOEXTRACT -eq 1 ] || cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \ + -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \ + -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \ + -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \ + -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so + + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + patch -p1 <$srcdir/osg-xine-1.2.patch + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} diff --git a/community-staging/openscenegraph/osg-xine-1.2.patch b/community-staging/openscenegraph/osg-xine-1.2.patch new file mode 100644 index 000000000..c73b588dc --- /dev/null +++ b/community-staging/openscenegraph/osg-xine-1.2.patch @@ -0,0 +1,14 @@ +diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c +--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 ++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 +@@ -2769,8 +2769,8 @@ + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; +- rgb_class->driver_class.get_identifier = get_identifier; +- rgb_class->driver_class.get_description = get_description; ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); diff --git a/community-staging/synfig/PKGBUILD b/community-staging/synfig/PKGBUILD new file mode 100644 index 000000000..6e6ad21fe --- /dev/null +++ b/community-staging/synfig/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 72702 2012-06-20 11:15:26Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Franco Iacomella <yaco@gnu.org> + +pkgname=synfig +pkgver=0.63.05 +pkgrel=2 +pkgdesc="Professional vector animation program (CLI renderer only)" +arch=(i686 x86_64) +url="http://synfig.org" +license=('GPL2') +depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng' + 'libtiff' 'libdv' 'libmng') +optdepends=('openexr' 'libsigc++') +conflicts=('synfig-core') +replaces=('synfig-core') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz + build-fix.patch + ffmpeg-0.8.patch) +md5sums=('8591cf17c26405d68d2cc050a2929292' + 'b5568b06fae1a7ee465b5380b1139b83' + 'ebf41046097cfd778dee9a9854561dae') + +build() { + cd $srcdir/$pkgname-$pkgver + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" + [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } + [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv + patch -p1 -i $srcdir/build-fix.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community-staging/synfig/build-fix.patch b/community-staging/synfig/build-fix.patch new file mode 100644 index 000000000..be45fdc68 --- /dev/null +++ b/community-staging/synfig/build-fix.patch @@ -0,0 +1,31 @@ +diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp +--- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05 13:04:07.000000000 +0400 ++++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14 14:32:49.000000000 +0400 +@@ -31,6 +31,10 @@ + # include <config.h> + #endif + ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libswscale/swscale.h> ++ + #include "trgt_av.h" + + extern "C" +@@ -116,14 +120,14 @@ + picture = avcodec_alloc_frame(); + if (!picture) + return NULL; +- size = avpicture_get_size(pix_fmt, width, height); ++ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height); + picture_buf = (uint8_t *)malloc(size); + if (!picture_buf) { + av_free(picture); + return NULL; + } + avpicture_fill((AVPicture *)picture, picture_buf, +- pix_fmt, width, height); ++ (enum ::PixelFormat)pix_fmt, width, height); + return picture; + } + diff --git a/community-staging/synfig/ffmpeg-0.8.patch b/community-staging/synfig/ffmpeg-0.8.patch new file mode 100644 index 000000000..4ba40fff2 --- /dev/null +++ b/community-staging/synfig/ffmpeg-0.8.patch @@ -0,0 +1,60 @@ +diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp +--- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp 2011-09-29 10:51:41.000000000 +0200 ++++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp 2011-10-31 16:39:03.000000000 +0100 +@@ -441,7 +441,7 @@ + if( context->coded_frame ) + pkt.pts = context->coded_frame->pts; + if( context->coded_frame && context->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + //kluge for raw picture format (they said they'd fix) + if (formatc->oformat->flags & AVFMT_RAWPICTURE) +@@ -463,7 +463,7 @@ + if( context->coded_frame ) + pkt.pts = context->coded_frame->pts; + if( context->coded_frame && context->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + ret = av_write_frame(formatc, &pkt); + +@@ -567,17 +567,17 @@ + if (typestring) + { + //formatptr guess_format(type, filename, MIME type) +- format = guess_format(typestring,NULL,NULL); ++ format = av_guess_format(typestring,NULL,NULL); + } + else + { +- format = guess_format(NULL, filename, NULL); ++ format = av_guess_format(NULL, filename, NULL); + } + + if(!format) + { + synfig::warning("Unable to Guess the output, defaulting to mpeg"); +- format = guess_format("mpeg", NULL, NULL); ++ format = av_guess_format("mpeg", NULL, NULL); + } + + if(!format) +@@ -753,7 +753,7 @@ + + context = st->codec; + context->codec_id = (CodecID)codec_id; +- context->codec_type = CODEC_TYPE_VIDEO; ++ context->codec_type = AVMEDIA_TYPE_VIDEO; + + //PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???) + +@@ -800,7 +800,7 @@ + + context = stream->codec; + context->codec_id = (CodecID)codec_id; +- context->codec_type = CODEC_TYPE_AUDIO; ++ context->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + context->bit_rate = 64000; diff --git a/community-testing/tor/PKGBUILD b/community-testing/tor/PKGBUILD index b0ab616ac..91d4f0112 100644 --- a/community-testing/tor/PKGBUILD +++ b/community-testing/tor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72561 2012-06-16 17:11:10Z dreisner $ +# $Id: PKGBUILD 72700 2012-06-20 10:57:00Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.36 -pkgrel=2 +pkgver=0.2.2.37 +pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64') url='http://www.torproject.org/' @@ -21,8 +21,8 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'tor' 'tor.conf.d' 'tor.service') -md5sums=('620b2110086aba01236b57f1d5aba416' - '0401cf01ad0bcc9aba4f9c1bb5e8e810' +md5sums=('5aafdca4fb6af6e12b503d32b03f14a7' + '8d3adf70109d16e860dbf414f9d70eac' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa' diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD index bb6f410f9..2787666ab 100644 --- a/community/icecast/PKGBUILD +++ b/community/icecast/PKGBUILD @@ -1,54 +1,50 @@ -# $Id: PKGBUILD 46955 2011-05-13 20:41:15Z andrea $ +# $Id: PKGBUILD 72696 2012-06-20 10:14:35Z lfleischer $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=icecast -pkgver=2.3.2 -pkgrel=5 -pkgdesc="Streaming audio over the Internet" +pkgver=2.3.3 +pkgrel=1 +pkgdesc='Streaming audio over the Internet' arch=('i686' 'x86_64') license=('GPL') -url="http://www.icecast.org/" +url='http://www.icecast.org/' depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') backup=('etc/icecast.xml' 'etc/logrotate.d/icecast') source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'icecastd' 'icecast.logrotate' + 'icecastd' + 'icecast.logrotate' 'start-by-nobody.patch') -md5sums=('ff516b3ccd2bcc31e68f460cd316093f' +md5sums=('2b5d1b40778922e5f6431b7758c359ad' 'e823c1fdb080aae3d0c54ef8be95f7cb' '59c6552bcb1dd9fb542af8670dfabd3c' 'd8e929d2214123a1954da4383bf16583') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/start-by-nobody.patch + patch -Np1 -i "${srcdir}/start-by-nobody.patch" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" - # install man-page + make DESTDIR="${pkgdir}" install + + # install man page sed -i -e 's/icecast2/icecast/g' debian/icecast2.1 - install -Dm644 debian/icecast2.1 \ - ${pkgdir}/usr/share/man/man1/icecast.1 - - # init file - install -Dm755 ${srcdir}/icecastd \ - ${pkgdir}/etc/rc.d/icecast - # rotate the logs (taken from Fedora) - install -Dm644 ${srcdir}/icecast.logrotate \ - ${pkgdir}/etc/logrotate.d/icecast - - # install log dir - install -d -g99 -o99 ${pkgdir}/var/log/icecast + install -Dm644 debian/icecast2.1 "${pkgdir}/usr/share/man/man1/icecast.1" + + # install rc.d script and logrotate config (taken from Fedora) + install -Dm755 "${srcdir}/icecastd" "${pkgdir}/etc/rc.d/icecast" + install -Dm644 "${srcdir}/icecast.logrotate" "${pkgdir}/etc/logrotate.d/icecast" + + # create log directory + install -d -g99 -o99 "${pkgdir}/var/log/icecast" } diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD index fd4e4a819..548ac6af6 100644 --- a/community/python2-ldap/PKGBUILD +++ b/community/python2-ldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71038 2012-05-22 09:19:07Z spupykin $ +# $Id: PKGBUILD 72704 2012-06-20 12:26:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org> pkgname=python2-ldap -pkgver=2.4.9 +pkgver=2.4.10 pkgrel=1 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('python2' 'libldap>=2.4.26') makedepends=('chrpath') replaces=('python-ldap') source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz) -md5sums=('d76131af192771567d3f2d2aff9469a9') +md5sums=('a15827ca13c90e9101e5e9405c1d83be') build() { cd $srcdir/python-ldap-$pkgver diff --git a/community/vym/PKGBUILD b/community/vym/PKGBUILD index db30012d4..49e690a1a 100644 --- a/community/vym/PKGBUILD +++ b/community/vym/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70394 2012-05-05 13:56:05Z jlichtblau $ +# $Id: PKGBUILD 72708 2012-06-20 18:18:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: S�ren Holm <sgh@sgh.dk> pkgname=vym -pkgver=2.0.12 +pkgver=2.2.0 pkgrel=1 pkgdesc="A mindmapping tool" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ changelog=$pkgname.changelog install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ $pkgname.desktop) -sha256sums=('6557ce134506f6654767c63e4a7aedbd9acc4c6f02e38cdb6041fa4ca51ca06c' +sha256sums=('98ebf4f134a8e3ea0de8ce5853177edcdbef76a11a1156268fc167d2da40c6d1' 'e299c69c213e7aac3f5b5d0ab088132b4ec7cb63a391f272e75ed64f049d541b') build() { diff --git a/community/vym/vym.changelog b/community/vym/vym.changelog index 6035624df..dcf26d8f4 100644 --- a/community/vym/vym.changelog +++ b/community/vym/vym.changelog @@ -1,3 +1,6 @@ +2012-06-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vym 2.2.0-1 + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vym 2.0.12-1 diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index 5aff0c1d7..ab17fcc8e 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 162104 2012-06-20 02:05:56Z eric $ +# $Id: PKGBUILD 162110 2012-06-20 09:21:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc pkgver=22.18 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') url="http://psmisc.sourceforge.net/index.html" license=('GPL') groups=('base') depends=('ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c') +source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz psmisc22.18-usage.patch) +sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c' + '5cd326dd969b07c46d10c7d1172b91d65cbc6e10') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/psmisc22.18-usage.patch" ./configure --prefix=/usr make } diff --git a/core/psmisc/psmisc22.18-usage.patch b/core/psmisc/psmisc22.18-usage.patch new file mode 100644 index 000000000..7736a6542 --- /dev/null +++ b/core/psmisc/psmisc22.18-usage.patch @@ -0,0 +1,11 @@ +diff -Naur psmisc-22.18-orig/src/killall.c psmisc-22.18/src/killall.c +--- psmisc-22.18-orig/src/killall.c 2012-06-20 05:07:16.563742846 -0400 ++++ psmisc-22.18/src/killall.c 2012-06-20 05:08:38.250412923 -0400 +@@ -637,6 +637,7 @@ + " (must precede other arguments)\n")); + #endif /*WITH_SELINUX*/ + fputc('\n', stderr); ++ exit (1); + } + + diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 03eeab096..374b805ac 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 159956 2012-05-27 10:22:22Z tomegun $ +# $Id: PKGBUILD 162106 2012-06-20 04:34:13Z eric $ # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod -pkgver=2.1.1 -pkgrel=3 +pkgver=2.1.2 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" license=('GPL') depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') -makedepends=('flex' 'intltool') +makedepends=('flex' 'intltool' 'libvorbis' 'faad2') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' - 'id3v2: mp3 conversion support') + 'libvorbis: OGG support' + 'id3v2: mp3 conversion support' + 'faad2: m4a conversion support') install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") -md5sums=('36fd0324fd1d1da00fcddacef1b09983') +md5sums=('88fef3f947cbb7ae6b714080733a3b6b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index bd0c6c8f0..a9f1c8542 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 156972 2012-04-23 09:10:20Z ibiru $ +# $Id: PKGBUILD 162120 2012-06-21 01:49:02Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL2.1') -depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite') makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('15b15fb58a3c54102c3e3489b4bd5ee0') +md5sums=('f4e6ca551cc4603276f9acdc2b5d4db4') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy --with-tls=openssl make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" } diff --git a/libre/hplip-libre/.hplip.install.swp b/libre/hplip-libre/.hplip.install.swp Binary files differnew file mode 100644 index 000000000..819e785c6 --- /dev/null +++ b/libre/hplip-libre/.hplip.install.swp diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index c2cec2e13..b6bc8ce2f 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -2,19 +2,19 @@ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> -# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> +# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.4 -pkgrel=4 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +pkgver=3.12.6 +pkgrel=1 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -22,40 +22,41 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-pyqt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox') -replaces=('hpijs' "${_pkgname}") + 'python2-gobject2: for running hp-toolbox' + 'libusbx: for advanced usb support') +replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('a063f76aa47edab55a3f31ff2558df07' - '2fe18f4091afb3dec200271dc7836128') +md5sums=('5303938e8630775ea6fb383af85775e5' + 'b562457e4c713d8609b3d6dd2be10baf') build() { cd "$srcdir/$_pkgname-$pkgver" export PYTHON=python2 - + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + export AUTOMAKE='automake --foreign' autoreconf --force --install @@ -70,7 +71,7 @@ build() { --enable-hpijs-install \ --enable-foomatic-drv-install \ --enable-pp-build \ - --enable-udev-acl-rules + --enable-udev-acl-rules #--help make } diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 402d1c7fd..e4326a2e1 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> # Changes: # * Adapt to linux-libre # * virtualbox-{archlinux,parabola}-* @@ -11,7 +11,7 @@ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.16 +pkgver=4.1.18 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -194,7 +194,7 @@ package_virtualbox-parabola-additions(){ # install sample config install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service" } -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '5f85710e0b8606de967716ded7b2d351' '755ab0dd9bcacf2c00d2275b1ca69547' 'a1ff1d1b4423556887e48a32978226a6' diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD index 8ff59d712..d3b44d748 100644 --- a/libre/virtualbox-modules-lts/PKGBUILD +++ b/libre/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> pkgbase=virtualbox-modules-lts pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts') -pkgver=4.1.14 +pkgver=4.1.18 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -15,7 +15,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index e14bf347c..2e747105a 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> -#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +#Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.16 -pkgrel=2 +pkgver=4.1.18 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -14,7 +14,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD new file mode 100644 index 000000000..2e1f83af6 --- /dev/null +++ b/testing/bluez/PKGBUILD @@ -0,0 +1,87 @@ +# $Id: PKGBUILD 162114 2012-06-20 10:11:40Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez +pkgver=4.100 +pkgrel=2 +pkgdesc="Libraries and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus-core' 'python2' 'systemd-tools') +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") +conflicts=('bluez-libs' 'bluez-utils') +provides=('bluez-libs' 'bluez-utils') +replaces=('bluez-libs' 'bluez-utils') +options=('!libtool') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" + 'bluetooth.conf.d' + 'rc.bluetooth' + 'org.bluez.service') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cp ../org.bluez.service src/ + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/lib \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-tools \ + --enable-bccmd \ + --enable-dfutool \ + --enable-hid2hci \ + --enable-hidd \ + --enable-pand \ + --enable-dund \ + --enable-cups \ + --enable-wiimote \ + --disable-test \ + --with-systemdunitdir=/usr/lib/systemd/system + + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + install -Dm644 ${srcdir}/bluetooth.conf.d \ + ${pkgdir}/etc/conf.d/bluetooth + + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input +} +md5sums=('54809d476c52665ff64594b6828016b5' + '7412982b440f29fa7f76a41a87fef985' + '864cbd24e6efc3592e9284b0b5fb2cfd' + '54c7de598327bf11d56592235d0702f4') diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d new file mode 100644 index 000000000..1c1e02589 --- /dev/null +++ b/testing/bluez/bluetooth.conf.d @@ -0,0 +1,30 @@ +# Bluetooth configuraton file + +# Bluetooth services (allowed values are "true" and "false") + +# Run the bluetoothd daemon (default: true) +#DAEMON_ENABLE="false" + +# Run the sdp daemon (default: false) +# If this is disabled, hcid's internal sdp daemon will be used +#SDPD_ENABLE="true" + +# Run the bluetooth HID daemon (default: false) +#HIDD_ENABLE="true" + +# Activate rfcomm ports (default: false) +#RFCOMM_ENABLE="true" + +# Run bluetooth dial-up networking daemon (default: false) +#DUND_ENABLE="true" + +# Run bluetooth PAN daemon (default: false) +#PAND_ENABLE="true" + +# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) +#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +# Options for hidd, dund and pand (default: none) +HIDD_OPTIONS="--server" +#DUND_OPTIONS="" +#PAND_OPTIONS="" diff --git a/testing/bluez/org.bluez.service b/testing/bluez/org.bluez.service new file mode 100644 index 000000000..dd7ae8f1c --- /dev/null +++ b/testing/bluez/org.bluez.service @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=org.bluez +Exec=/bin/false +User=root +SystemdService=dbus-org.bluez.service diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth new file mode 100644 index 000000000..0feeaeab6 --- /dev/null +++ b/testing/bluez/rc.bluetooth @@ -0,0 +1,93 @@ +#!/bin/bash +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="bluetoothd" +HIDD_NAME="hidd" +RFCOMM_NAME="rfcomm" +PAND_NAME="pand" +DUND_NAME="dund" + +DAEMON_EXEC="/usr/sbin/bluetoothd" +HIDD_EXEC="/usr/bin/hidd" +RFCOMM_EXEC="/usr/bin/rfcomm" +PAND_EXEC="/usr/bin/pand" +DUND_EXEC="/usr/bin/dund" + +DAEMON_ENABLE="true" +HIDD_ENABLE="false" +RFCOMM_ENABLE="false" +PAND_ENABLE="false" +DUND_ENABLE="false" + +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +HIDD_OPTIONS="" +PAND_OPTIONS="" +DUND_OPTIONS="" + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +case "$1" in + start) + stat_busy "Starting bluetooth subsystem:" + if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then + stat_append " $DAEMON_NAME" + $DAEMON_EXEC + sleep 1 + fi + if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then + stat_append " $HIDD_NAME" + $HIDD_EXEC $HIDD_OPTIONS + fi + if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all + fi + if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then + stat_append " $PAND_NAME" + $PAND_EXEC $PAND_OPTIONS + fi + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi + add_daemon bluetooth + stat_done + ;; + stop) + stat_busy "Stopping bluetooth subsystem:" + + stat_append " $DUND_NAME" + killall $DUND_NAME >/dev/null 2>&1 + + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + + if [ -x "$RFCOMM_EXEC" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC release all >/dev/null 2>&1 + fi + + stat_append " $HIDD_NAME" + killall $HIDD_NAME >/dev/null 2>&1 + + stat_append " $DAEMON_NAME" + killall $DAEMON_NAME >/dev/null 2>&1 + + rm_daemon bluetooth + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch new file mode 100644 index 000000000..8916689f7 --- /dev/null +++ b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch @@ -0,0 +1,93 @@ +From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 31 Mar 2012 12:17:39 +0200 +Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules + +This means that we can move the configuration paths from /lib +to /usr/lib without having to touch the kernel and related +packages. + +That can be dealt with separately at a later location, in which case +all we have to do is revert this patch. + +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + libkmod/libkmod.c | 2 +- + tools/depmod.c | 2 +- + tools/modinfo.c | 4 ++-- + tools/modprobe.c | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 12c1112..11edfa0 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -196,7 +196,7 @@ static int log_priority(const char *priority) + return 0; + } + +-static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules"; ++static const char *dirname_default_prefix = "/lib/modules"; + + static char *get_kernel_release(const char *dirname) + { +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 7bb1c5d..454d538 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[]) + } + + cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, +- "%s" ROOTPREFIX "/lib/modules/%s", ++ "%s/lib/modules/%s", + root == NULL ? "" : root, cfg.kversion); + + if (optind == argc) +diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c +index aa5223f..b13cd4b 100644 +--- a/tools/modinfo.c ++++ b/tools/modinfo.c +@@ -339,7 +339,7 @@ static void help(const char *progname) + "\t-0, --null Use \\0 instead of \\n\n" + "\t-F, --field=FIELD Print only provided FIELD\n" + "\t-k, --set-version=VERSION Use VERSION instead of `uname -r`\n" +- "\t-b, --basedir=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-b, --basedir=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-V, --version Show version\n" + "\t-h, --help Show this help\n", + progname); +@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[]) + } + kversion = u.release; + } +- snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s", ++ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s", + root, kversion); + dirname = dirname_buf; + } +diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c +index 4760682..ccb41d8 100644 +--- a/tools/modprobe.c ++++ b/tools/modprobe.c +@@ -128,7 +128,7 @@ static void help(const char *progname) + "\t-n, --show Same as --dry-run\n" + + "\t-C, --config=FILE Use FILE instead of default search paths\n" +- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n" + + "\t-s, --syslog print to syslog, not stderr\n" +@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv) + kversion = u.release; + } + snprintf(dirname_buf, sizeof(dirname_buf), +- "%s" ROOTPREFIX "/lib/modules/%s", root, ++ "%s/lib/modules/%s", root, + kversion); + dirname = dirname_buf; + } +-- +1.7.9.5 + diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD new file mode 100644 index 000000000..e4c947e97 --- /dev/null +++ b/testing/kmod/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 162116 2012-06-20 13:14:03Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=kmod +pkgver=9 +pkgrel=1 +pkgdesc="Linux kernel module handling" +arch=('i686' 'x86_64') +url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' +license=('GPL2') +depends=('glibc' 'zlib') +options=('!libtool') +provides=('module-init-tools=3.16') +conflicts=('module-init-tools') +replaces=('module-init-tools') +source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" + "depmod-search.conf" + "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") +md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' + 'dd62cbf62bd8f212f51ef8c43bec9a77' + 'b099be8997331dcb549617188cabc6af') + +build() { + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch + + ./configure \ + --sysconfdir=/etc \ + --with-zlib \ + --with-rootprefix=/usr + + make +} + +check() { + # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p + make -C "$pkgname-$pkgver" check || : +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + # extra directories + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" + + # add symlinks to kmod + ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" + ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" + + for tool in {ins,ls,rm}mod modinfo; do + ln -s kmod "$pkgdir/usr/bin/$tool" + done + + # install depmod.d file for search/ dir + install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf" +} + +# vim: ft=sh syn=sh et diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf new file mode 100644 index 000000000..36f2cf7db --- /dev/null +++ b/testing/kmod/depmod-search.conf @@ -0,0 +1,5 @@ +# +# /usr/lib/depmod.d/search.conf +# + +search updates extramodules built-in diff --git a/testing/openconnect/PKGBUILD b/testing/openconnect/PKGBUILD new file mode 100644 index 000000000..bc40e21d1 --- /dev/null +++ b/testing/openconnect/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 162122 2012-06-21 01:52:52Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=openconnect +pkgver=4.00 +pkgrel=1 +epoch=1 +pkgdesc="Open client for Cisco AnyConnect VPN" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.infradead.org/openconnect.html" +depends=('libxml2' 'openssl' 'libproxy' 'vpnc') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('86120e286033c40bfca5b902f40b181d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch new file mode 100644 index 000000000..8806fe849 --- /dev/null +++ b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch @@ -0,0 +1,28 @@ +Index: src/freeglut_window.c +=================================================================== +--- src/freeglut_window.c (Revision 832) ++++ src/freeglut_window.c (Arbeitskopie) +@@ -594,10 +594,9 @@ + #if TARGET_HOST_POSIX_X11 + if ( window ) + { +- glXMakeContextCurrent( ++ glXMakeCurrent( + fgDisplay.Display, + window->Window.Handle, +- window->Window.Handle, + window->Window.Context + ); + +@@ -932,10 +932,9 @@ + XSetWMProtocols( fgDisplay.Display, window->Window.Handle, + &fgDisplay.DeleteWindow, 1 ); + +- glXMakeContextCurrent( ++ glXMakeCurrent( + fgDisplay.Display, + window->Window.Handle, +- window->Window.Handle, + window->Window.Context + ); + diff --git a/~lukeshu/freeglut26/PKGBUILD b/~lukeshu/freeglut26/PKGBUILD new file mode 100644 index 000000000..5245eca9d --- /dev/null +++ b/~lukeshu/freeglut26/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Eric Belanger <eric@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +_pkgname=freeglut +pkgname=freeglut26 +pkgver=2.6.0 +pkgrel=1 + +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") + +pkgdesc="Provides functionality for small OpenGL programs" +arch=('i686' 'x86_64') +url="http://freeglut.sourceforge.net/" +license=('MIT') +depends=('libxxf86vm' 'mesa' 'libxi') +replaces=('glut') +provides=('glut') +conflicts=('glut') +options=('!libtool') +source=(http://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz \ + 2.6.0-GFX_radeon.patch) +md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3') +sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # fixes an issue with the radeon[hd] ATI opensource drivers + # ref: http://bugs.gentoo.org/show_bug.cgi?id=295163 + patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" + + ./autogen.sh + ./configure --prefix=/usr --disable-static + make all +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" +} diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD index f7f7cd0b1..0d9320f69 100644 --- a/~lukeshu/make-graph/PKGBUILD +++ b/~lukeshu/make-graph/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> _pkgname=make pkgname=$_pkgname-graph pkgver=3.82 -pkgrel=4.1 +pkgrel=4.2 provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph." arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" license=('GPL3') -groups=('base-devel') +#groups=('base-devel') depends=('glibc' 'sh') install=$_pkgname.install source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 |