From d30cd2d87478c665b6fc65f312474e8687bb974b Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 27 Jan 2012 19:48:40 +0100 Subject: Update glibc. --- core/glibc/PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/glibc') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 730633e9c..e35e3c666 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -8,6 +8,8 @@ pkgname=glibc pkgver=2.15 pkgrel=3 _glibcdate=20111227 +_glibcportsver=2.15 +_glibcportsdate=20120127 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -20,7 +22,7 @@ backup=(etc/gai.conf etc/nscd.conf) options=('!strip') install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz +source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-2.10-dont-build-timezone.patch glibc-2.10-bz4781.patch @@ -37,6 +39,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t locale.gen.txt locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' + '935995663b89924a98d20a636045949a' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' @@ -65,9 +68,9 @@ mksource() { mksource-ports() { git clone git://sourceware.org/git/glibc-ports.git pushd glibc-ports - git checkout -b glibc-2.14-arch origin/release/2.14/master + git checkout -b glibc-${_glibcportsver}-arch origin/release/${_glibcportsver}/master popd - tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/* + tar -cvJf glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-ports/* } build() { -- cgit v1.2.3-54-g00ecf From 1c2a0b0ad198c54e908452121ed1ab42e7d50809 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 27 Jan 2012 23:00:42 +0100 Subject: Fix glibc's 2.15 bits/syscall.h not working on N32. --- core/glibc/PKGBUILD | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core/glibc') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index e35e3c666..da42c3140 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -121,6 +121,9 @@ build() { ln -s ../glibc-ports ports + # Fix typo making util-linux build fail. + sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf -- cgit v1.2.3-54-g00ecf From 738e6c6d93b4c7118e49b38c610abed8b7f7d55a Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Jan 2012 23:14:55 +0000 Subject: Sat Jan 28 23:14:55 UTC 2012 --- community-staging/calibre/PKGBUILD | 8 +- community-staging/evas-svn/PKGBUILD | 56 +++ community-staging/gimp-plugin-mathmap/PKGBUILD | 36 ++ .../gimp-plugin-mathmap/fix_libnoise_build.patch | 12 + .../gimp-plugin-mathmap/libpng15.patch | 170 ++++++++ community-staging/libgeotiff/PKGBUILD | 28 ++ community-staging/luminancehdr/PKGBUILD | 42 ++ .../luminancehdr/luminance-hdr-2.1.0-libraw.patch | 10 + .../luminancehdr/luminancehdr.changelog | 36 ++ .../luminancehdr/luminancehdr.install | 12 + community-staging/luxrender/PKGBUILD | 49 +++ community-staging/rawtherapee/PKGBUILD | 54 +++ community-staging/rawtherapee/rawtherapee.install | 22 + community/calibre/PKGBUILD | 6 +- community/ffmpeg2theora/PKGBUILD | 27 +- community/libalkimia/PKGBUILD | 11 +- community/linuxtv-dvb-apps/PKGBUILD | 8 +- community/mythtv/PKGBUILD | 23 +- community/nodejs/PKGBUILD | 4 +- community/python2-pycuda/PKGBUILD | 35 ++ community/virtualbox-modules/PKGBUILD | 4 +- core/e2fsprogs/PKGBUILD | 9 +- core/glibc/PKGBUILD | 24 +- core/glibc/glibc-2.15-regex.patch | 16 + core/glibc/glibc-2.15-strcmp-disable-avx.patch | 48 +++ extra/alsa-lib/PKGBUILD | 6 +- extra/alsa-oss/PKGBUILD | 8 +- extra/alsa-plugins/PKGBUILD | 8 +- extra/alsa-utils/PKGBUILD | 10 +- extra/bluez/PKGBUILD | 12 +- extra/bluez/fix-a2dp.patch | 68 ++++ extra/ffmpeg/PKGBUILD | 12 +- extra/glew/PKGBUILD | 4 +- extra/hwloc/PKGBUILD | 8 +- extra/openmpi/PKGBUILD | 4 +- extra/transcode/PKGBUILD | 12 +- extra/transcode/ffmpeg-0.10.patch | 14 + extra/vlc/PKGBUILD | 4 +- extra/xine-lib/PKGBUILD | 9 +- multilib/lib32-alsa-lib/PKGBUILD | 6 +- multilib/lib32-alsa-oss/PKGBUILD | 8 +- multilib/lib32-alsa-plugins/PKGBUILD | 11 +- multilib/lib32-glibc/PKGBUILD | 26 +- multilib/lib32-glibc/glibc-2.15-regex.patch | 16 + .../glibc-2.15-strcmp-disable-avx.patch | 48 +++ multilib/lib32-udev/PKGBUILD | 6 +- staging/cinepaint/LICENSE | 25 ++ staging/cinepaint/PKGBUILD | 47 +++ staging/cinepaint/cinepaint-libpng15.patch | 452 +++++++++++++++++++++ staging/cinepaint/cinepaint.install | 11 + staging/kdebase-workspace/PKGBUILD | 80 ++++ staging/kdebase-workspace/fixpath.patch | 34 ++ staging/kdebase-workspace/kde-np.pam | 8 + staging/kdebase-workspace/kde.pam | 8 + .../kdebase-workspace/kdebase-workspace.install | 25 ++ staging/kdebase-workspace/kdm | 36 ++ staging/kdebase-workspace/kdm-xinitrd.patch | 18 + staging/kdebase-workspace/kscreensaver.pam | 1 + staging/kdebase-workspace/terminate-server.patch | 11 + staging/kdegraphics-okular/PKGBUILD | 34 ++ .../kdegraphics-okular/kdegraphics-okular.install | 12 + staging/kdegraphics-strigi-analyzer/PKGBUILD | 31 ++ staging/mjpegtools/PKGBUILD | 34 ++ staging/mjpegtools/mjpegtools-v4l-2.6.38.patch | 100 +++++ staging/mjpegtools/mjpegtools.install | 16 + staging/scribus/PKGBUILD | 50 +++ staging/scribus/scribus.install | 13 + staging/transcode/PKGBUILD | 12 +- staging/transcode/ffmpeg-0.10.patch | 14 + staging/vlc/PKGBUILD | 4 +- testing/gmp/538dfce27f41.patch | 38 ++ testing/gmp/PKGBUILD | 37 ++ testing/gmp/gmp.install | 20 + 73 files changed, 2087 insertions(+), 134 deletions(-) create mode 100644 community-staging/evas-svn/PKGBUILD create mode 100644 community-staging/gimp-plugin-mathmap/PKGBUILD create mode 100644 community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch create mode 100644 community-staging/gimp-plugin-mathmap/libpng15.patch create mode 100644 community-staging/libgeotiff/PKGBUILD create mode 100644 community-staging/luminancehdr/PKGBUILD create mode 100644 community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch create mode 100644 community-staging/luminancehdr/luminancehdr.changelog create mode 100644 community-staging/luminancehdr/luminancehdr.install create mode 100644 community-staging/luxrender/PKGBUILD create mode 100644 community-staging/rawtherapee/PKGBUILD create mode 100644 community-staging/rawtherapee/rawtherapee.install create mode 100644 community/python2-pycuda/PKGBUILD create mode 100644 core/glibc/glibc-2.15-regex.patch create mode 100644 core/glibc/glibc-2.15-strcmp-disable-avx.patch create mode 100644 extra/bluez/fix-a2dp.patch create mode 100644 extra/transcode/ffmpeg-0.10.patch create mode 100644 multilib/lib32-glibc/glibc-2.15-regex.patch create mode 100644 multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch create mode 100644 staging/cinepaint/LICENSE create mode 100644 staging/cinepaint/PKGBUILD create mode 100644 staging/cinepaint/cinepaint-libpng15.patch create mode 100644 staging/cinepaint/cinepaint.install create mode 100644 staging/kdebase-workspace/PKGBUILD create mode 100644 staging/kdebase-workspace/fixpath.patch create mode 100644 staging/kdebase-workspace/kde-np.pam create mode 100644 staging/kdebase-workspace/kde.pam create mode 100644 staging/kdebase-workspace/kdebase-workspace.install create mode 100644 staging/kdebase-workspace/kdm create mode 100644 staging/kdebase-workspace/kdm-xinitrd.patch create mode 100644 staging/kdebase-workspace/kscreensaver.pam create mode 100644 staging/kdebase-workspace/terminate-server.patch create mode 100644 staging/kdegraphics-okular/PKGBUILD create mode 100644 staging/kdegraphics-okular/kdegraphics-okular.install create mode 100644 staging/kdegraphics-strigi-analyzer/PKGBUILD create mode 100644 staging/mjpegtools/PKGBUILD create mode 100644 staging/mjpegtools/mjpegtools-v4l-2.6.38.patch create mode 100644 staging/mjpegtools/mjpegtools.install create mode 100644 staging/scribus/PKGBUILD create mode 100644 staging/scribus/scribus.install create mode 100644 staging/transcode/ffmpeg-0.10.patch create mode 100644 testing/gmp/538dfce27f41.patch create mode 100644 testing/gmp/PKGBUILD create mode 100644 testing/gmp/gmp.install (limited to 'core/glibc') diff --git a/community-staging/calibre/PKGBUILD b/community-staging/calibre/PKGBUILD index 5f43241ff..720658ce7 100644 --- a/community-staging/calibre/PKGBUILD +++ b/community-staging/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62598 2012-01-22 12:14:47Z giovanni $ +# $Id: PKGBUILD 62822 2012-01-27 11:24:45Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.36 -pkgrel=3 +pkgver=0.8.37 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('cc009c02fa0db088d074fef8b983e78a' +md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community-staging/evas-svn/PKGBUILD b/community-staging/evas-svn/PKGBUILD new file mode 100644 index 000000000..ef4748be8 --- /dev/null +++ b/community-staging/evas-svn/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 62866 2012-01-28 03:10:42Z ebelanger $ +# Maintainer: Ronald van Haren +# Contributor: Ronald van Haren + +pkgname=evas-svn +pkgver=66901 +pkgrel=2 +pkgdesc="A hardware-accelerated canvas API for X-Windows" +arch=('i686' 'x86_64') +groups=('e17-libs-svn' 'e17-svn') +url="http://www.enlightenment.org" +license=('BSD') +depends=('giflib' 'librsvg' 'eet-svn' 'cairo' 'libjpeg' 'libxrender' 'mesa' + 'fribidi' 'fontconfig') +makedepends=('subversion') +conflicts=('evas') +provides=('evas') +options=('!libtool' '!emptydirs') +md5sums=() + +_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas" +_svnmod="evas" + +build() { + cd "$srcdir" + +msg "Connecting to $_svntrunk SVN server...." + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + cp -r $_svnmod $_svnmod-build + cd $_svnmod-build + + ./autogen.sh --prefix=/usr --enable-fb --enable-xrender-x11 \ + --enable-gl-x11 --enable-fontconfig --enable-async-preload \ + --enable-async-events --enable-pipe-render --enable-async-render + make +} + +package() { + cd "$srcdir/$_svnmod-build" + make DESTDIR="$pkgdir" install + +# install license files + install -Dm644 "$srcdir/$_svnmod-build/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + rm -r "$srcdir/$_svnmod-build" + +} diff --git a/community-staging/gimp-plugin-mathmap/PKGBUILD b/community-staging/gimp-plugin-mathmap/PKGBUILD new file mode 100644 index 000000000..60ec94ec0 --- /dev/null +++ b/community-staging/gimp-plugin-mathmap/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 62824 2012-01-27 12:07:45Z stativ $ +# Maintainer: Lukas Jirkovsky +# Contributor: Geoffroy Carrier +# Contributor: Serge Gielkens +pkgname=gimp-plugin-mathmap +pkgver=1.3.5 +pkgrel=2 +pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae" +arch=('i686' 'x86_64') +url="http://www.complang.tuwien.ac.at/schani/mathmap/" +license=('GPL') +depends=('gimp' 'gsl' 'gtksourceview2' 'fftw' 'giflib') +makedepends=('doxygen' 'unzip') +provides=('gimp-mathmap') +replaces=('gimp-mathmap') +source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \ + fix_libnoise_build.patch libpng15.patch) +md5sums=('6ff66d070ea410dee1a27283d05b8beb' + 'eca40de0ba0e6b8d34b7d1f904bc3d18' + '9780d6354b7380b772c4616253ecee54') + +build() { + cd "$srcdir/mathmap-$pkgver" + + # fix problem with building libnoise + patch -Np1 < "$srcdir"/fix_libnoise_build.patch + # fix for libpng 1.5 + patch -Np1 < "$srcdir"/libpng15.patch + + make +} + +package() { + cd "$srcdir/mathmap-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch b/community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch new file mode 100644 index 000000000..fc81ba0d8 --- /dev/null +++ b/community-staging/gimp-plugin-mathmap/fix_libnoise_build.patch @@ -0,0 +1,12 @@ +diff -rup mathmap-1.3.5/Makefile mathmap-1.3.5-fix//Makefile +--- mathmap-1.3.5/Makefile 2009-08-23 13:56:14.000000000 +0200 ++++ mathmap-1.3.5-fix//Makefile 2010-11-11 16:48:13.308941852 +0100 +@@ -178,7 +178,7 @@ backends/lazy_creator.o : backends/lazy_ + $(CXX) $(MATHMAP_CXXFLAGS) $(FORMATDEFS) -o $@ -c backends/lazy_creator.cpp + + builtins/libnoise.o : builtins/libnoise.cpp builtins/libnoise.h +- $(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -o $@ -c builtins/libnoise.cpp ++ $(CXX) $(MATHMAP_CXXFLAGS) -Ilibnoise/noise/include -Ilibnoise/noise/src -o $@ -c builtins/libnoise.cpp + + new_builtins.c opdefs.h opfuncs.h compiler_types.h llvm-ops.h : builtins.lisp ops.lisp + clisp builtins.lisp diff --git a/community-staging/gimp-plugin-mathmap/libpng15.patch b/community-staging/gimp-plugin-mathmap/libpng15.patch new file mode 100644 index 000000000..3cf95387c --- /dev/null +++ b/community-staging/gimp-plugin-mathmap/libpng15.patch @@ -0,0 +1,170 @@ +diff -rup mathmap-1.3.5/rwimg/rwpng.c mathmap-1.3.5.new/rwimg/rwpng.c +--- mathmap-1.3.5/rwimg/rwpng.c 2009-08-23 13:56:14.000000000 +0200 ++++ mathmap-1.3.5.new/rwimg/rwpng.c 2012-01-27 13:02:29.708023734 +0100 +@@ -58,34 +58,34 @@ open_png_file_reading (const char *filen + data->end_info = png_create_info_struct(data->png_ptr); + assert(data->end_info != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + png_init_io(data->png_ptr, data->file); + + png_read_info(data->png_ptr, data->info_ptr); + +- *width = data->info_ptr->width; +- *height = data->info_ptr->height; ++ *width = png_get_image_width(data->png_ptr, data->info_ptr); ++ *height = png_get_image_height(data->png_ptr, data->info_ptr); + +- if (data->info_ptr->bit_depth != 8 && data->info_ptr->bit_depth != 16) ++ if (png_get_bit_depth(data->png_ptr, data->info_ptr) != 8 && png_get_bit_depth(data->png_ptr, data->info_ptr) != 16) + { + fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n"); + /* FIXME: free stuff */ + return 0; + } + +- if (data->info_ptr->color_type != PNG_COLOR_TYPE_RGB +- && data->info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA +- && data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY +- && data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB ++ && png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA ++ && png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY ++ && png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY_ALPHA) + { + fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n"); + /* FIXME: free stuff */ + return 0; + } + +- if (data->info_ptr->interlace_type != PNG_INTERLACE_NONE) ++ if (png_get_interlace_type(data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE) + { + fprintf(stderr, "Interlaced PNG files are not supported.\n"); + /* FIXME: free stuff */ +@@ -105,24 +105,24 @@ png_read_lines (void *_data, unsigned ch + int bps, spp; + unsigned char *row; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + +- if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY) + spp = 1; +- else if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + spp = 2; +- else if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB) + spp = 3; + else + spp = 4; + +- if (data->info_ptr->bit_depth == 16) ++ if (png_get_bit_depth(data->png_ptr, data->info_ptr) == 16) + bps = 2; + else + bps = 1; + +- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); ++ row = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * spp * bps); + + for (i = 0; i < num_lines; ++i) + { +@@ -131,13 +131,13 @@ png_read_lines (void *_data, unsigned ch + png_read_row(data->png_ptr, (png_bytep)row, 0); + + if (spp <= 2) +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j) + for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps]; ++ lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] = row[j * spp * bps]; + else +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j) + for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] ++ lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] + = row[j * spp * bps + channel * bps]; + } + +@@ -151,7 +151,7 @@ png_free_reader_data (void *_data) + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (data->have_read) +@@ -180,7 +180,7 @@ open_png_file_writing (const char *filen + data->info_ptr = png_create_info_struct(data->png_ptr); + assert(data->info_ptr != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (pixel_stride == 4) +@@ -188,18 +188,9 @@ open_png_file_writing (const char *filen + + png_init_io(data->png_ptr, data->file); + +- data->info_ptr->width = width; +- data->info_ptr->height = height; +- data->info_ptr->valid = 0; +- data->info_ptr->rowbytes = width * 3; +- data->info_ptr->palette = 0; +- data->info_ptr->num_palette = 0; +- data->info_ptr->num_trans = 0; +- data->info_ptr->bit_depth = 8; +- data->info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT; +- data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT; +- data->info_ptr->interlace_type = PNG_INTERLACE_NONE; ++ png_set_IHDR(data->png_ptr, data->info_ptr, width, height, ++ 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, ++ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + png_write_info(data->png_ptr, data->info_ptr); + +@@ -216,12 +207,12 @@ png_write_lines (void *_data, unsigned c + unsigned char *packed_line; + int i; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + if (data->pixel_stride != 3) + { +- packed_line = (unsigned char*)malloc(data->info_ptr->width * 3); ++ packed_line = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * 3); + assert(packed_line != 0); + } + else +@@ -235,7 +226,7 @@ png_write_lines (void *_data, unsigned c + { + int j; + +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j) + { + packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0]; + packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1]; +@@ -257,7 +248,7 @@ png_free_writer_data (void *_data) + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + png_write_end(data->png_ptr, data->info_ptr); +Only in mathmap-1.3.5.new/rwimg: rwpng.c.orig diff --git a/community-staging/libgeotiff/PKGBUILD b/community-staging/libgeotiff/PKGBUILD new file mode 100644 index 000000000..daa4cb449 --- /dev/null +++ b/community-staging/libgeotiff/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62808 2012-01-27 07:11:48Z ebelanger $ +# Maintainer: Brad Fanella +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: William Rea + +pkgname=libgeotiff +pkgver=1.3.0 +pkgrel=2 +pkgdesc="A TIFF based interchange format for georeferenced raster imagery" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.remotesensing.org/geotiff" +depends=('libtiff' 'proj' 'libjpeg>=7') +options=('!makeflags' '!libtool') +source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz) +md5sums=('6ac3c22e44711e9a3add9044e40b9527') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/libgeotiff/LICENSE" +} diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD new file mode 100644 index 000000000..c9cc4e4ab --- /dev/null +++ b/community-staging/luminancehdr/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 62810 2012-01-27 07:16:32Z ebelanger $ +# Maintainer: Jaroslav Lichtblau +# Contributor: Lukas Jirkovsky +# Contributor: Dmitry N. Shilov + +pkgname=luminancehdr +pkgver=2.1.0 +pkgrel=7 +pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' +arch=('i686' 'x86_64') +url='http://qtpfsgui.sourceforge.net/' +license=('GPL') +depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit') +optdepends=('hugin: align image stack functionality') +install=$pkgname.install +changelog=$pkgname.changelog +options=('!emptydirs') +source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz + luminance-hdr-2.1.0-libraw.patch) +sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac' + 'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c') + +build() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + # stolen from gentoo + patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch + + if [ ${CARCH} = i686 ]; then + sed -i 's/ -msse2//' project.pro + fi + + lrelease project.pro + qmake PREFIX=/usr + make +} + +package() { + cd "${srcdir}/luminance-hdr-${pkgver}" + + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch new file mode 100644 index 000000000..8472a7422 --- /dev/null +++ b/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch @@ -0,0 +1,10 @@ +--- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig ++++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp +@@ -94,7 +94,6 @@ + RawProcessor.set_progress_handler(cb, callback_data); + int ret; + +- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC; + OUT.output_bps = 16; + + //OUT.gamm[0] = 1/2.4; //sRGB diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog new file mode 100644 index 000000000..807541292 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.changelog @@ -0,0 +1,36 @@ +2012-01-27 Eric Belanger + * Rebuild against libpng 1.5 and libtiff 4.0 + +2011-08-21 Jaroslav Lichtblau + * luminancehdr 2.1.0-1 + +2011-05-01 Jaroslav Lichtblau + * luminancehdr 2.0.2-1 + +2010-10-19 Jaroslav Lichtblau + * exiv2 0.20 rebuild + +2010-10-17 Jaroslav Lichtblau + * Update to major release 2.0.1 + +2010-06-27 Jaroslav Lichtblau + * Package renamed to LuminanceHDR + * Update to major release 2.0.0 + +2010-03-09 Andrea Scarpino + * exiv2 0.19 rebuild + +2009-11-02 Biru Ionut + * add translation and fix segfault on old i686 procesors + +2009-04-29 Jaroslav Lichtblau + * Update to major release v1.9.3 + +2009-04-04 Jaroslav Lichtblau + * Minor version (v1.9.2-3) update caused by exiv2 upgrade. + +2008-11-04 Jaroslav Lichtblau + * Minor version (v1.9.2-2) update caused by openexr upgrade. + +2008-09-17 Jaroslav Lichtblau + * Package moved to [community] diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install new file mode 100644 index 000000000..279762804 --- /dev/null +++ b/community-staging/luminancehdr/luminancehdr.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD new file mode 100644 index 000000000..7bbc73649 --- /dev/null +++ b/community-staging/luxrender/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 62835 2012-01-27 16:09:08Z stativ $ +# Maintainer: Lukas Jirkovsky +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya +pkgname=luxrender +pkgver=0.8 +_pkgver=45d3e13eb94c +pkgrel=12 +pkgdesc="Rendering system for physically correct, unbiased image synthesis" +arch=('i686' 'x86_64') +url="http://www.luxrender.net/" +license=('GPL') +depends=('boost-libs' 'freeimage' 'openexr' 'libcl') +optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ + 'python: Python interface (pylux)' + 'nvidia-utils: OpenCL support for nVidia GPUs' \ + 'amdstream: OpenCL support for AMD GPUs' \ + 'intel-opencl-sdk: OpenCL support for Intel CPUs') +makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers') +source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2) +md5sums=('0f2d856385db72131f51e44a7ee527fa') + +build() { + cd "$srcdir"/luxrender-lux-$_pkgver + + sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ + . + make +} + +package() { + cd "$srcdir"/luxrender-lux-$_pkgver + make DESTDIR="$pkgdir" install + + # fix library path on x86_64 + [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + + #install pylux + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/rawtherapee/PKGBUILD b/community-staging/rawtherapee/PKGBUILD new file mode 100644 index 000000000..73eb438d6 --- /dev/null +++ b/community-staging/rawtherapee/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 62820 2012-01-27 11:15:07Z stativ $ +# Maintainer: Lukas Jirkovsky +# Contributor: Bogdan Szczurek +# Contributor: Vaclav Kramar +# Contributor: Archie + +pkgname=rawtherapee +pkgver=4.0.6 +pkgrel=2 +pkgdesc="RAW photo editor" +arch=('i686' 'x86_64') +url="http://www.rawtherapee.com/" +license=('GPL') +depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('mercurial' 'cmake') +install=rawtherapee.install +source=() +md5sums=() + +_root="https://rawtherapee.googlecode.com/hg/" +_repo="rawtherapee" + +build() { + cd "$srcdir" + msg "Connecting to Mercurial server...." + + if [ -d $_repo ] ; then + cd $_repo + hg pull + hg up "$pkgver" + msg "The local files are updated." + else + hg clone -u "$pkgver" $_root $_repo + fi + + msg "Mercurial checkout done or server timeout" + msg "Starting make..." + + if [ -e "$srcdir/$_repo-build" ]; then + rm -rf "$srcdir/$_repo-build" + fi + mkdir "$srcdir/$_repo-build" + cd "$srcdir/$_repo-build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + ../$_repo + make +} + +package() { + cd "$srcdir/$_repo-build" + make DESTDIR="$pkgdir/" install +} diff --git a/community-staging/rawtherapee/rawtherapee.install b/community-staging/rawtherapee/rawtherapee.install new file mode 100644 index 000000000..385eec8f4 --- /dev/null +++ b/community-staging/rawtherapee/rawtherapee.install @@ -0,0 +1,22 @@ +post_install() { + echo "update desktop mime database..." + update-desktop-database -q + update-mime-database usr/share/mime 1>&2 > /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install $1 + + if [ ${2%%_*} == "3.0a1" ]; then + echo "There were lots of changes to the behavior of the majority of tools." + echo "This may cause your files to look differently than before." + fi +} + +post_remove() { + post_install $1 +} + + +# vim:set ts=2 sw=2 et: diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index af9fd6d17..072e7ea43 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62518 2012-01-20 10:19:50Z giovanni $ +# $Id: PKGBUILD 62819 2012-01-27 11:13:37Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.36 +pkgver=0.8.37 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('cc009c02fa0db088d074fef8b983e78a' +md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index 7f086d67f..0b23e1f23 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 58395 2011-11-12 17:16:59Z ibiru $ +# $Id: PKGBUILD 62853 2012-01-27 19:43:55Z arodseth $ # Maintainer: Jaroslav Lichtblau # Contributor: Eric Belanger # Contributor: Angelo Theodorou - +# Contributor: Alexander Rødseth pkgname=ffmpeg2theora pkgver=0.28 -pkgrel=2 -pkgdesc="A simple converter to create Ogg Theora files" -arch=('i686' 'x86_64') +pkgrel=3 +pkgdesc="Simple converter to create Ogg Theora files" +arch=('x86_64' 'i686') url="http://www.v2v.cc/~j/ffmpeg2theora/" license=('GPL3') depends=('ffmpeg') -makedepends=('pkgconfig' 'scons') -changelog=$pkgname.changelog -source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2) +makedepends=('pkgconfig' 'scons') # 'libkate') +source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's:pp_mode_t:pp_mode:' src/ffmpeg2theora.c + sed -i 's:pp_context_t:pp_context:' src/ffmpeg2theora.c scons } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man" + cd "$srcdir/$pkgname-$pkgver" + + scons install destdir="$pkgdir" prefix="/usr" mandir="PREFIX/share/man" } + +# vim:set ts=2 sw=2 et: diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD index 2f14f4bf6..004c8d6fa 100644 --- a/community/libalkimia/PKGBUILD +++ b/community/libalkimia/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 58105 2011-11-06 17:14:04Z lcarlier $ +# $Id: PKGBUILD 62859 2012-01-27 20:47:22Z lcarlier $ +# Maintainer: Laurent Carlier # Contributor: gumper pkgname=libalkimia -pkgver=4.3.1 -pkgrel=2 +pkgver=4.3.2 +pkgrel=1 pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC." depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') @@ -11,7 +12,7 @@ url=('http://kde-apps.org/content/show.php/libalkimia?content=137323') license=('LGPL') arch=('i686' 'x86_64') source=("http://kde-apps.org/CONTENT/content-files/137323-libalkimia-$pkgver.tar.bz2") -md5sums=('73d7f1365118019030b2045d95c92456') +md5sums=('8d7b529c7be5f72ae1cbb02e818e9b79') build() { cd "${srcdir}" @@ -21,7 +22,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=DebugFull \ + -DCMAKE_BUILD_TYPE=Release \ -Wno-dev make } diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD index 69ff17ba1..bcd07680a 100644 --- a/community/linuxtv-dvb-apps/PKGBUILD +++ b/community/linuxtv-dvb-apps/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 58911 2011-11-20 05:15:40Z jconder $ +# $Id: PKGBUILD 62806 2012-01-27 05:32:06Z jconder $ # Maintainer: Jonathan Conder # Contributor: Jaroslaw Swierczynski # Contributor: Camille Moncelier pkgname=linuxtv-dvb-apps -pkgver=1452 +pkgver=1465 pkgrel=1 -_hgrev=d4e8bf5658ce +_hgrev=69fc03702a64 pkgdesc='Viewer programs for DVB cards' arch=('i686' 'x86_64') url='http://www.linuxtv.org/' license=('GPL') source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") -sha256sums=('c3bb865ea5c8dd97050d7b3a68ee158dadff50a2fb948d955b3a559be3cf31c5') +sha256sums=('4c32fd895d826254779f1020f69a1978ea3c0130440f82f7b18e2d8e5378804a') build() { cd "dvb-apps-$_hgrev" diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 1c8404d90..53309c180 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61085 2011-12-21 20:51:44Z andrea $ +# $Id: PKGBUILD 62798 2012-01-27 02:10:36Z jconder $ # Maintainer: Jonathan Conder # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -6,8 +6,8 @@ # Contributor: dorphell pkgname=mythtv -pkgver=0.24.1 -pkgrel=4 +pkgver=0.24.2 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -15,30 +15,23 @@ url="http://www.mythtv.org/" license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients' - 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' - 'python-lxml' 'wget' 'qtwebkit') + 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' + 'python-lxml' 'wget' 'qtwebkit') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' - 'mythbackend.conf' - 'mythtv-v4l2-fix.patch' - 'build.patch') -md5sums=('6870c679619ec58456e76839745411d8' + 'mythbackend.conf') +md5sums=('7259fd24560da77da90b1494492f9550' 'feadcc9ad064d93d6dceab1efc0bd9ed' - 'bb8e4033d82428d827570fae9ba15e6a' - 'ba5c91df80f0d3f7563a873e71a3725c' - '3188962917e98c4e07818dccd64bc423') + 'bb8e4033d82428d827570fae9ba15e6a') build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch - patch -Np1 -i ${srcdir}/build.patch - ARCH="${CARCH/_/-}" ./configure --prefix=/usr --cpu="$ARCH" \ --enable-mmx \ diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 8ec1be501..217b6651d 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.6.8 +pkgver=0.6.9 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('9fd7baa2d27b848c3134e6ae35bb87b2') +md5sums=('c2d2aee123a141ba8431855f1d9c8200') build() { cd node-v${pkgver} diff --git a/community/python2-pycuda/PKGBUILD b/community/python2-pycuda/PKGBUILD new file mode 100644 index 000000000..37049dea1 --- /dev/null +++ b/community/python2-pycuda/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62828 2012-01-27 14:09:50Z stephane $ +# Maintainer: Stéphane Gaudreault +pkgname=python2-pycuda +pkgver=2011.2.2 +pkgrel=1 +pkgdesc="Python wrapper for Nvidia CUDA" +arch=('i686' 'x86_64') +url="http://mathema.tician.de/software/pycuda" +license=('MIT/X Consortium') +source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz) +depends=('cuda-toolkit' 'python2-numpy' 'python2-pytools' 'python2') +optdepends=('python2-pytest') +makedepends=('ctags' 'python2-distribute' 'mesa') +provides=('pycuda') +replaces=('pycuda') +conflicts=('pycuda') +sha1sums=('026ca33f66d35c82a087a5ef3f8e0f213575059b') + +build() { + cd "${srcdir}/pycuda-${pkgver}" + python2 ./configure.py \ + --cuda-root=/opt/cuda-toolkit \ + --boost-compiler=gcc \ + --cuda-enable-gl \ + --cuda-inc-dir=/opt/cuda-toolkit/include \ + --cudadrv-lib-dir=/opt/cuda-toolkit/lib \ + --cudart-lib-dir=/opt/cuda-toolkit/lib + + make +} + +package() { + cd "${srcdir}/pycuda-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 +} diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 8ff5888e8..548827524 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62232 2012-01-18 17:19:12Z ibiru $ +# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $ #Maintainer: Ionut Biru pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') pkgver=4.1.8 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index d21e51aaf..bd9f609fa 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142380 2011-11-08 22:04:59Z ronald $ +# $Id: PKGBUILD 147737 2012-01-27 16:09:24Z dan $ # Maintainer: Ronald van Haren # Contributor: judd pkgname=e2fsprogs -pkgver=1.41.14 -pkgrel=2 +pkgver=1.42 +pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') @@ -16,9 +16,8 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5' +sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') - build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 761a6684d..e2ef2b2ae 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145917 2012-01-04 01:25:10Z allan $ +# $Id: PKGBUILD 147715 2012-01-27 11:00:22Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=3 +pkgrel=4 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -29,9 +29,10 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.15-regex.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch - glibc-2.15-math64crash.patch + glibc-2.15-strcmp-disable-avx.patch nscd locale.gen.txt locale-gen) @@ -44,9 +45,10 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + 'b3526cbd5e29773560dba725db99af5a' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' + '7a44dd821835e4984aa75ad44fad3baf' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -94,6 +96,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + # Fix up regcomp/regexec + # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 + patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch @@ -102,9 +108,13 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - # revert optimized math routines that can cause crashes (FS#27736, FS#27743) - # obviously not a real fix... - patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + # Disable AVX in strcmp as this breaks Xen + # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 + patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch + + # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 + rm sysdeps/x86_64/fpu/multiarch/* install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf diff --git a/core/glibc/glibc-2.15-regex.patch b/core/glibc/glibc-2.15-regex.patch new file mode 100644 index 000000000..6385f2c08 --- /dev/null +++ b/core/glibc/glibc-2.15-regex.patch @@ -0,0 +1,16 @@ +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index bc19243..124f8cc 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) + } + + static unsigned char +-internal_function __attribute ((pure)) ++internal_function + re_string_fetch_byte_case (re_string_t *pstr) + { + if (BE (!pstr->mbs_allocated, 1)) +-- +1.7.3.4 + diff --git a/core/glibc/glibc-2.15-strcmp-disable-avx.patch b/core/glibc/glibc-2.15-strcmp-disable-avx.patch new file mode 100644 index 000000000..7f1f5b8f2 --- /dev/null +++ b/core/glibc/glibc-2.15-strcmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index b5f7fda08..b04e7ef4e 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110694 2011-02-21 17:46:05Z tpowa $ +# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $ # Maintainer: judd pkgname=alsa-lib -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') +md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD index 2d32793d0..06e0f8cfc 100644 --- a/extra/alsa-oss/PKGBUILD +++ b/extra/alsa-oss/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136976 2011-09-04 11:56:05Z pierre $ +# $Id: PKGBUILD 147698 2012-01-27 07:26:45Z tpowa $ # Contributor: judd pkgname=alsa-oss -pkgver=1.0.17 -pkgrel=2 +pkgver=1.0.25 +pkgrel=1 pkgdesc="OSS compatibility library" arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,6 @@ url="http://www.alsa-project.org" options=('!libtool') depends=('alsa-lib') source=("ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2") -md5sums=('1b1850c2fc91476a73d50f537cbd402f') build() { cd $srcdir/$pkgname-$pkgver @@ -23,3 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } +md5sums=('922ea177db15c72f1b5037181c73f934') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 93478640d..fd5b54072 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $ +# $Id: PKGBUILD 147731 2012-01-27 15:55:17Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Sergej Pupykin # Contributor: Daniel Ehlers pkgname=alsa-plugins -pkgver=1.0.24 -pkgrel=3 +pkgver=1.0.25 +pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" @@ -19,7 +19,7 @@ optdepends=('libpulse: PulseAudio plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") -md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') +md5sums=('038c023eaa51171f018fbf7141255185') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index cb8da4e3d..b45dcba2c 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 135667 2011-08-17 07:46:33Z tpowa $ +# $Id: PKGBUILD 147702 2012-01-27 07:30:51Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils -pkgver=1.0.24.2 -pkgrel=3 +pkgver=1.0.25 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" #can not use >=$pkgver due to use of letters in alsa-lib update versioning -depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc') +depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate') makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 @@ -35,7 +35,7 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' +md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9' '2ba1a1cbf653bf1a69f8a720fd6549da' '7521bf20f5b3501a510ec4462ae4a934' '4c8ae9f976c7df5e271a4cb91ccc7767' diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index be653c012..1de5cc7e1 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146600 2012-01-13 22:26:31Z andrea $ +# $Id: PKGBUILD 147730 2012-01-27 15:54:11Z heftig $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgname=bluez pkgver=4.98 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -26,15 +26,17 @@ options=('!libtool' 'emptydirs') 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') + 'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch') md5sums=('4aca8a0929250212e9a75fb60dd75b05' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') + '8f9498707f809506928b2e480d3b6789' + 'd6a34317e56b7c2bd990791d89d6c3cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-a2dp.patch" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/bluez/fix-a2dp.patch b/extra/bluez/fix-a2dp.patch new file mode 100644 index 000000000..e4bb1372a --- /dev/null +++ b/extra/bluez/fix-a2dp.patch @@ -0,0 +1,68 @@ +From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 26 Jan 2012 23:39:02 +0200 +Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket + is disabled + +Local endpoints can only be used when UNIX socket API is available. +--- + audio/a2dp.c | 15 +++++++-------- + 1 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/audio/a2dp.c b/audio/a2dp.c +index 5ca105c..bbb91ce 100644 +--- a/audio/a2dp.c ++++ b/audio/a2dp.c +@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) + + int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + { +- int sbc_srcs = 1, sbc_sinks = 1; ++ int sbc_srcs = 0, sbc_sinks = 0; + int mpeg12_srcs = 0, mpeg12_sinks = 0; +- gboolean source = TRUE, sink = FALSE, socket = TRUE; ++ gboolean source = TRUE, sink = FALSE, socket = FALSE; + gboolean delay_reporting = FALSE; + char *str; + GError *err = NULL; +@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + source = TRUE; + if (strstr(str, "Source")) + sink = TRUE; ++ if (strstr(str, "Socket")) ++ socket = TRUE; + g_free(str); + } + +@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + } + + /* Don't register any local sep if Socket is disabled */ +- if (socket == FALSE) { +- sbc_srcs = 0; +- sbc_sinks = 0; +- mpeg12_srcs = 0; +- mpeg12_sinks = 0; ++ if (socket == FALSE) + goto proceed; +- } + + str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_srcs = 1; + } else { + sbc_srcs = atoi(str); + g_free(str); +@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) + if (err) { + DBG("audio.conf: %s", err->message); + g_clear_error(&err); ++ sbc_sinks = 1; + } else { + sbc_sinks = atoi(str); + g_free(str); +-- +1.7.6.5 + diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index c8c5e77c8..62b506d67 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146495 2012-01-11 22:55:38Z ibiru $ +# $Id: PKGBUILD 147716 2012-01-27 11:08:09Z ibiru $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=20120111 +pkgver=20120127 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -13,16 +13,12 @@ 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/$pkgname-$pkgver.tar.xz - revert-enabling-threads.patch) -md5sums=('7a54b2b1af86a746696d1c0b2a79979c' - '79cc22bc2ac3e67d96c340cb7061e64d') +source=(ftp://ftp.archlinux.org/other/ffmpeg/$pkgname-$pkgver.tar.xz) +md5sums=('dc706cdb31801b4746f37459b0c38b7e') build() { cd "$srcdir/$pkgname" - patch -Np1 -R -i "$srcdir/revert-enabling-threads.patch" - ./configure \ --prefix=/usr \ --enable-libmp3lame \ diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index eb08d7441..f72d47777 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138482 2011-09-24 16:46:38Z stephane $ +# $Id: PKGBUILD 147734 2012-01-27 15:57:44Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: SleepyDog pkgname=glew pkgver=1.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index fba4aecc2..fb16f141b 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145717 2011-12-28 15:42:53Z stephane $ +# $Id: PKGBUILD 147724 2012-01-27 15:42:58Z stephane $ # Maintainer : Stéphane Gaudreault # Contributor: Sylvain HENRY # Contributor: Hervé YVIQUEL pkgname=hwloc -pkgver=1.3.1 +pkgver=1.4 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ depends=('sh' 'pciutils') makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1051c937c3d2a4c98922903f313a1fa021bb35ba') +source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 4673b26a6..990899c83 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143088 2011-11-22 17:32:55Z stephane $ +# $Id: PKGBUILD 147726 2012-01-27 15:43:19Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=openmpi pkgver=1.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 73566a33f..a74dbfd64 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144420 2011-12-05 18:18:14Z jgc $ +# $Id: PKGBUILD 147746 2012-01-27 20:01:33Z ibiru $ # Maintainer: # Contributor: Sarah Hay # Contributor: roberto @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" @@ -17,14 +17,18 @@ makedepends=('nasm') options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch) + subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch + ffmpeg-0.10.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae') + '591943a33235342a66c3df0625a164a1479c09ae' + '3c03111cfae88db918afff3837cec7db32ace3cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch" ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch new file mode 100644 index 000000000..5965c180c --- /dev/null +++ b/extra/transcode/ffmpeg-0.10.patch @@ -0,0 +1,14 @@ +diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c +--- transcode-1.1.7.orig/filter/filter_pp.c 2012-01-27 19:55:13.706613234 +0000 ++++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +0000 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 257798d85..09a939f80 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $ +# $Id: PKGBUILD 147739 2012-01-27 19:27:41Z ibiru $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.13 -pkgrel=1 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 7447852b0..add03d4a7 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146428 2012-01-10 23:37:52Z eric $ +# $Id: PKGBUILD 147743 2012-01-27 19:57:13Z eric $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" @@ -11,7 +11,7 @@ license=('LGPL' 'GPL') depends=('libxvmc' 'ffmpeg' 'libxinerama') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' - 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs') + 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau') optdepends=('imagemagick: for using the imagemagick plugin' \ 'jack: for using the jack plugin' \ 'vcdimager: for using the vcd plugin' \ @@ -27,7 +27,8 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libmpcdec: for using the musepack plugin' \ 'libcaca: for using the caca plugin' \ 'libbluray: for using the bluray plugin' \ - 'gnome-vfs: for using the gnome-vfs plugin') + 'gnome-vfs: for using the gnome-vfs plugin' \ + 'libvdpau: for using the VDPAU plugin') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d') diff --git a/multilib/lib32-alsa-lib/PKGBUILD b/multilib/lib32-alsa-lib/PKGBUILD index 8dff0f1d3..5f25c3e12 100644 --- a/multilib/lib32-alsa-lib/PKGBUILD +++ b/multilib/lib32-alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40235 2011-02-22 08:22:12Z heftig $ +# $Id: PKGBUILD 62814 2012-01-27 09:25:15Z bluewind $ # Maintainer: Jan "heftig" Steffens _pkgbasename=alsa-lib pkgname=lib32-${_pkgbasename} -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support (32 bit)" arch=('x86_64') @@ -29,4 +29,4 @@ package() { # Clean up lib32 package rm -rf "${pkgdir}"/usr/{bin,include,share} } -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') +md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD index bcb47a8e7..51273a145 100644 --- a/multilib/lib32-alsa-oss/PKGBUILD +++ b/multilib/lib32-alsa-oss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57964 2011-11-04 22:23:42Z lcarlier $ +# $Id: PKGBUILD 62816 2012-01-27 09:25:54Z bluewind $ # Maintainer: judd _pkgbasename=alsa-oss pkgname=lib32-${_pkgbasename} -pkgver=1.0.17 -pkgrel=3 +pkgver=1.0.25 +pkgrel=1 pkgdesc="OSS compatibility library (32 bit)" arch=(x86_64) license=('GPL') @@ -12,7 +12,7 @@ url="http://www.alsa-project.org" options=(!libtool) depends=('lib32-glibc' 'lib32-alsa-lib' 'alsa-oss') source=(ftp://ftp.alsa-project.org/pub/oss-lib/${_pkgbasename}-$pkgver.tar.bz2) -md5sums=('1b1850c2fc91476a73d50f537cbd402f') +md5sums=('922ea177db15c72f1b5037181c73f934') build() { cd $srcdir/${_pkgbasename}-$pkgver diff --git a/multilib/lib32-alsa-plugins/PKGBUILD b/multilib/lib32-alsa-plugins/PKGBUILD index 4a0ce214d..87d8c90f9 100644 --- a/multilib/lib32-alsa-plugins/PKGBUILD +++ b/multilib/lib32-alsa-plugins/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 40238 2011-02-22 08:27:39Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 62831 2012-01-27 15:59:19Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) _pkgbasename=alsa-plugins pkgname=lib32-$_pkgbasename -pkgver=1.0.24 +pkgver=1.0.25 pkgrel=1 pkgdesc="Extra alsa plugins (32-bit)" arch=(x86_64) url="http://www.alsa-project.org" license=(GPL) depends=(lib32-alsa-lib $_pkgbasename) -makedepends=(lib32-{libpulse,jack,speex,libsamplerate} gcc-multilib) +makedepends=(lib32-libpulse lib32-jack lib32-speex lib32-libsamplerate gcc-multilib) optdepends=('lib32-libpulse: PulseAudio plugin' 'lib32-jack: Jack plugin' 'lib32-libsamplerate: libsamplerate resampling plugin' 'lib32-speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2") -md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') +md5sums=('038c023eaa51171f018fbf7141255185') build() { cd "$srcdir/$_pkgbasename-$pkgver" @@ -32,4 +32,5 @@ build() { package() { cd "$srcdir/$_pkgbasename-$pkgver" make DESTDIR="$pkgdir" install + rm -r "$pkgdir/usr/share" } diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 9b962e426..5f73ba36f 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 62206 2012-01-18 10:47:20Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 62829 2012-01-27 15:39:54Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=3.1 +pkgrel=4 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -27,9 +27,10 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.15-regex.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch - glibc-2.15-math64crash.patch + glibc-2.15-strcmp-disable-avx.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' @@ -40,9 +41,10 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + 'b3526cbd5e29773560dba725db99af5a' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' + '7a44dd821835e4984aa75ad44fad3baf' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -79,6 +81,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + # Fix up regcomp/regexec + # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 + patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch @@ -87,9 +93,13 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - # revert optimized math routines that can cause crashes (FS#27736, FS#27743) - # obviously not a real fix... - patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + # Disable AVX in strcmp as this breaks Xen + # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 + patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch + + # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 + rm sysdeps/x86_64/fpu/multiarch/* cd ${srcdir} mkdir glibc-build diff --git a/multilib/lib32-glibc/glibc-2.15-regex.patch b/multilib/lib32-glibc/glibc-2.15-regex.patch new file mode 100644 index 000000000..6385f2c08 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-regex.patch @@ -0,0 +1,16 @@ +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index bc19243..124f8cc 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) + } + + static unsigned char +-internal_function __attribute ((pure)) ++internal_function + re_string_fetch_byte_case (re_string_t *pstr) + { + if (BE (!pstr->mbs_allocated, 1)) +-- +1.7.3.4 + diff --git a/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch new file mode 100644 index 000000000..7f1f5b8f2 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index a99efb154..e6637987a 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62609 2012-01-22 19:02:33Z lcarlier $ +# $Id: PKGBUILD 62861 2012-01-27 21:31:29Z lcarlier $ # Maintainer: Aaron Griffin # Maintainer: Tobias Powalowski # Maintainer: Thomas Bächler pkgname=('lib32-udev') -pkgver=178 +pkgver=179 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -14,7 +14,7 @@ options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev') makedepends=('gcc-multilib' 'gperf') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz) -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') +md5sums=('7d2880f66ea39146aae928f19ff3ca09') build() { export CC="gcc -m32" diff --git a/staging/cinepaint/LICENSE b/staging/cinepaint/LICENSE new file mode 100644 index 000000000..746207229 --- /dev/null +++ b/staging/cinepaint/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2005, Kai-Uwe Behrmann +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution.ntributors may be used to endorse or promote + products derived from this software without specific prior written + permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/staging/cinepaint/PKGBUILD b/staging/cinepaint/PKGBUILD new file mode 100644 index 000000000..e205c9c79 --- /dev/null +++ b/staging/cinepaint/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 147751 2012-01-27 22:56:00Z eric $ +# Maintainer: tobias [tobias.archlinux.org] +# Contributor: tobias [tobias.justdreams.de] + +pkgname=cinepaint +pkgver=1.0 +pkgrel=2 +pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" +arch=('i686' 'x86_64') +license=('LGPL' 'GPL' 'MIT') +url="http://www.cinepaint.org" +depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') +makedepends=('python2' 'gutenprint') +optdepends=('python2: for python plug-ins' + 'gutenprint: for print plug-ins' + 'ghostscript: for pdf plug-ins') +options=('!libtool') +install=cinepaint.install +source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz + LICENSE cinepaint-libpng15.patch) +md5sums=('7dfdb005d246578392ac9bd500534804' + '169085743f667c250ea2e4022efecf5f' + '682de65ad358512d00a8b76730453664') + +build() { + cd "${srcdir}/${pkgname}" + patch -p1 -i ../cinepaint-libpng15.patch + find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in + + aclocal -I aclocal + autoconf + LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ + --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 + sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ + plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install + sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ + -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" + sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop" + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/cinepaint/cinepaint-libpng15.patch b/staging/cinepaint/cinepaint-libpng15.patch new file mode 100644 index 000000000..e22edafae --- /dev/null +++ b/staging/cinepaint/cinepaint-libpng15.patch @@ -0,0 +1,452 @@ +diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c +--- cinepaint.old/plug-ins/png/png.c 2012-01-23 12:39:42.000000000 -0500 ++++ cinepaint/plug-ins/png/png.c 2012-01-23 12:39:50.000000000 -0500 +@@ -390,6 +390,16 @@ + gchar *progress; /* Title for progress display... */ + guchar alpha[256], /* Index -> Alpha */ + *alpha_ptr; /* Temporary pointer */ ++ png_byte color_type; ++ png_byte bit_depth; ++ png_colorp palette; ++ int num_palette; ++ png_charpp iccp_name; ++ int compression_type; ++ png_bytepp iccp_profile; ++ png_uint_32 iccp_proflen; ++ png_uint_32 width, height; ++ png_byte channels; + + /* + * PNG 0.89 and newer have a sane, forwards compatible constructor. +@@ -405,7 +415,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. File corrupted?", filename); + return image; +@@ -442,21 +452,26 @@ + */ + + png_read_info(pp, info); ++ color_type = png_get_color_type(pp, info); ++ width=png_get_image_width(pp, info); ++ height=png_get_image_height(pp, info); + + /* + * Latest attempt, this should be my best yet :) + */ + ++ bit_depth = png_get_bit_depth(pp, info); ++ + #ifndef WORDS_BIGENDIAN +- if(info->bit_depth == 16) ++ if(bit_depth == 16) + png_set_swap(pp); + #endif + +- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { ++ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { + png_set_expand(pp); + } + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { ++ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { + png_set_packing(pp); + } + +@@ -464,8 +479,8 @@ + * Expand G+tRNS to GA, RGB+tRNS to RGBA + */ + +- if (info->color_type != PNG_COLOR_TYPE_PALETTE && +- (info->valid & PNG_INFO_tRNS)) { ++ if (color_type != PNG_COLOR_TYPE_PALETTE && ++ (png_get_valid(pp, info, PNG_INFO_tRNS))) { + png_set_expand(pp); + } + +@@ -482,7 +497,7 @@ + + #if PNG_LIBPNG_VER > 99 + if (png_get_valid(pp, info, PNG_INFO_tRNS) && +- info->color_type == PNG_COLOR_TYPE_PALETTE) ++ color_type == PNG_COLOR_TYPE_PALETTE) + { + png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); + /* Copy the existing alpha values from the tRNS chunk */ +@@ -505,9 +520,9 @@ + + png_read_update_info(pp, info); + +- if(info->bit_depth==16) ++ if(bit_depth==16) + { +- switch (info->color_type) ++ switch (color_type) + { + case PNG_COLOR_TYPE_RGB : /* RGB */ + bpp = 6; +@@ -545,7 +560,7 @@ + } + else + { +- switch (info->color_type) ++ switch (color_type) + { + case PNG_COLOR_TYPE_RGB : /* RGB */ + bpp = 3; +@@ -582,7 +597,7 @@ + }; + } + +- image = gimp_image_new(info->width, info->height, image_type); ++ image = gimp_image_new(width, height, image_type); + if (image == -1) + { + g_message("Can't allocate new image\n%s", filename); +@@ -595,7 +610,7 @@ + * Create the "background" layer to hold the image... + */ + +- layer = gimp_layer_new(image, _("Background"), info->width, info->height, ++ layer = gimp_layer_new(image, _("Background"), width, height, + layer_type, 100, NORMAL_MODE); + gimp_image_add_layer(image, layer, 0); + +@@ -627,20 +642,21 @@ + + empty= 0; /* by default assume no full transparent palette entries */ + +- if (info->color_type & PNG_COLOR_MASK_PALETTE) { ++ if (color_type & PNG_COLOR_MASK_PALETTE) { + + #if PNG_LIBPNG_VER > 99 ++ png_get_PLTE(pp, info, &palette, &num_palette); + if (png_get_valid(pp, info, PNG_INFO_tRNS)) { + for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); + /* Calculates number of fully transparent "empty" entries */ + +- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), +- info->num_palette - empty); ++ gimp_image_set_cmap(image, (guchar *) (palette + empty), ++ num_palette - empty); + } else { +- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); ++ gimp_image_set_cmap(image, (guchar *)palette, num_palette); + } + #else +- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); ++ gimp_image_set_cmap(image, (guchar *)palette, num_palette); + #endif /* PNG_LIBPNG_VER > 99 */ + + } +@@ -659,18 +675,19 @@ + */ + + tile_height = gimp_tile_height (); +- pixel = g_new(guchar, tile_height * info->width * bpp); ++ pixel = g_new(guchar, tile_height * width * bpp); + pixels = g_new(guchar *, tile_height); ++ channels=png_get_channels(pp, info); + +- if(info->bit_depth==16) ++ if(bit_depth==16) + { + for (i = 0; i < tile_height; i ++) +- pixels[i] = pixel + info->width * info->channels * i * 2; ++ pixels[i] = pixel + width * channels * i * 2; + } + else + { + for (i = 0; i < tile_height; i ++) +- pixels[i] = pixel + info->width * info->channels * i; ++ pixels[i] = pixel + width * channels * i; + } + + for (pass = 0; pass < num_passes; pass ++) +@@ -680,11 +697,11 @@ + */ + + for (begin = 0, end = tile_height; +- begin < info->height; ++ begin < height; + begin += tile_height, end += tile_height) + { +- if (end > info->height) +- end = info->height; ++ if (end > height) ++ end = height; + + num = end - begin; + +@@ -697,20 +714,21 @@ + gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, + drawable->width, num); + +- gimp_progress_update(((double)pass + (double)end / (double)info->height) / ++ gimp_progress_update(((double)pass + (double)end / (double)height) / + (double)num_passes); + }; + }; + + #if defined(PNG_iCCP_SUPPORTED) + /* set icc profile */ +- if (info->iccp_proflen > 0) { +- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, +- info->iccp_profile, +- ICC_IMAGE_PROFILE); ++ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); ++ if (iccp_proflen > 0) { ++ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, ++ (gchar *)iccp_profile, ++ ICC_IMAGE_PROFILE); + printf ("%s:%d %s() set embedded profile \"%s\"\n", + __FILE__,__LINE__,__func__, +- info->iccp_name); ++ (char *)iccp_name); + } + #endif + +@@ -808,6 +826,14 @@ + blue; /* Used for palette background */ + time_t cutime; /* Time since epoch */ + struct tm *gmt; /* GMT broken down */ ++ png_byte color_type; ++ png_byte bit_depth; ++ int filter_method=0; ++ png_colorp palette; ++ int num_palette; ++ png_charpp iccp_name; ++ png_uint_32 height; ++ int compression_type; + + /* + * PNG 0.89 and newer have a sane, forwards compatible constructor. +@@ -824,7 +849,7 @@ + info = (png_infop)calloc(sizeof(png_info), 1); + #endif /* PNG_LIBPNG_VER > 88 */ + +- if (setjmp (pp->jmpbuf)) ++ if (setjmp (png_jmpbuf(pp))) + { + g_message ("%s\nPNG error. Couldn't save image", filename); + return 0; +@@ -857,15 +882,6 @@ + drawable = gimp_drawable_get (drawable_ID); + type = gimp_drawable_type (drawable_ID); + +- /* +- * Set the image dimensions, bit depth, interlacing and compression +- */ +- +- png_set_compression_level (pp, pngvals.compression_level); +- +- info->width = drawable->width; +- info->height = drawable->height; +- info->interlace_type = pngvals.interlaced; + + /* + * Set color type and remember bytes per pixel count +@@ -874,71 +890,69 @@ + switch (type) + { + case RGB_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 8; + bpp = 3; + break; + case RGBA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ bit_depth = 8; + bpp = 4; + break; + case GRAY_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = 8; + bpp = 1; + break; + case GRAYA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; +- info->bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; ++ bit_depth = 8; + bpp = 2; + break; + case INDEXED_IMAGE : + bpp = 1; +- info->bit_depth = 8; +- info->color_type = PNG_COLOR_TYPE_PALETTE; +- info->valid |= PNG_INFO_PLTE; +- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); +- info->num_palette= num_colors; ++ bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ png_get_valid(pp, info, PNG_INFO_PLTE); ++ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); + break; + case INDEXEDA_IMAGE : + bpp = 2; +- info->bit_depth = 8; +- info->color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = 8; ++ color_type = PNG_COLOR_TYPE_PALETTE; + respin_cmap (pp, info, image_ID); /* fix up transparency */ + break; + case U16_RGB_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_RGB; ++ bit_depth = 16; + bpp = 6; + break; + case U16_RGBA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_RGB_ALPHA; ++ bit_depth = 16; + bpp = 8; + break; + case U16_GRAY_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_GRAY; ++ bit_depth = 16; + bpp = 2; + break; + case U16_GRAYA_IMAGE : +- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; +- info->bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; ++ bit_depth = 16; + bpp = 4; + break; + case U16_INDEXED_IMAGE : + bpp = 2; +- info->bit_depth = 16; +- info->color_type = PNG_COLOR_TYPE_PALETTE; +- info->valid |= PNG_INFO_PLTE; +- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); +- info->num_palette= num_colors; ++ bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_PALETTE; ++ png_get_valid(pp, info, PNG_INFO_PLTE); ++ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); + break; + case U16_INDEXEDA_IMAGE : + bpp = 4; +- info->bit_depth = 16; +- info->color_type = PNG_COLOR_TYPE_PALETTE; ++ bit_depth = 16; ++ color_type = PNG_COLOR_TYPE_PALETTE; + respin_cmap (pp, info, image_ID); /* fix up transparency */ + break; + default: +@@ -950,30 +964,36 @@ + * Fix bit depths for (possibly) smaller colormap images + */ + +- if (info->valid & PNG_INFO_PLTE) { +- if (info->num_palette <= 2) +- info->bit_depth= 1; +- else if (info->num_palette <= 4) +- info->bit_depth= 2; +- else if (info->num_palette <= 16) +- info->bit_depth= 4; ++ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { ++ png_get_PLTE(pp, info, &palette, &num_palette); ++ if (num_palette <= 2) ++ bit_depth= 1; ++ else if (num_palette <= 4) ++ bit_depth= 2; ++ else if (num_palette <= 16) ++ bit_depth= 4; + /* otherwise the default is fine */ + } + ++ png_set_compression_level (pp, pngvals.compression_level); ++ png_set_IHDR(pp, info, drawable->width, drawable->height, ++ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); ++ ++ + // write icc profile + #if defined(PNG_iCCP_SUPPORTED) + if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { +- int size; ++ int size; + char *buffer; + + buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size, + ICC_IMAGE_PROFILE); + png_set_iCCP (pp, info, + gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), +- 0, buffer, size); ++ 0, (png_const_bytep)buffer, size); + printf ("%s:%d %s() embedd icc profile \"%s\"\n", + __FILE__,__LINE__,__func__, +- info->iccp_name); ++ (char *)iccp_name); + } + #endif + +@@ -1039,13 +1059,13 @@ + * Convert unpacked pixels to packed if necessary + */ + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) ++ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) + png_set_packing(pp); + + /* Set swapping for 16 bit per sample images */ + + #ifndef WORDS_BIGENDIAN +- if (info->bit_depth == 16) ++ if (bit_depth == 16) + png_set_swap(pp); + #endif + +@@ -1063,6 +1083,7 @@ + + gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, + drawable->height, FALSE, FALSE); ++ height=png_get_image_height(pp, info); + + for (pass = 0; pass < num_passes; pass ++) + { +@@ -1077,7 +1098,7 @@ + num = end - begin; + + gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); +- if (info->valid & PNG_INFO_tRNS) { ++ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { + for (i = 0; i < num; ++i) { + fixed= pixels[i]; + for (k = 0; k < drawable->width; ++k) { +@@ -1085,7 +1106,7 @@ + } + } + /* Forgot this case before, what if there are too many colors? */ +- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { ++ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { + for (i = 0; i < num; ++i) { + fixed= pixels[i]; + for (k = 0; k < drawable->width; ++k) { +@@ -1095,9 +1116,8 @@ + } + + png_write_rows (pp, pixels, num); +- + gimp_progress_update (((double)pass + (double)end / +- (double)info->height) / (double)num_passes); ++ (double)height) / (double)num_passes); + }; + }; + diff --git a/staging/cinepaint/cinepaint.install b/staging/cinepaint/cinepaint.install new file mode 100644 index 000000000..5e5cfef4d --- /dev/null +++ b/staging/cinepaint/cinepaint.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD new file mode 100644 index 000000000..a1b5b44c1 --- /dev/null +++ b/staging/kdebase-workspace/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 147708 2012-01-27 10:22:17Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.8.0 +pkgrel=2 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') +optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'e4198a443703f749b58a4fec88362fced1b45789' + '264e395c2c44cdda5a242c6dee649afab44cd6e5' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'd509dac592bd8b310df27991b208c95b6d907514') + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + patch -p0 -i "${srcdir}"/terminate-server.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_OpenGLES=ON \ + -DKWIN_BUILD_WITH_OPENGLES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde + install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np + install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm +} diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/staging/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam new file mode 100644 index 000000000..dfedb8edf --- /dev/null +++ b/staging/kdebase-workspace/kde-np.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth required pam_permit.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so +-session optional pam_systemd.so diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam new file mode 100644 index 000000000..9ec074d06 --- /dev/null +++ b/staging/kdebase-workspace/kde.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so +-session optional pam_systemd.so diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 000000000..f7d6d305b --- /dev/null +++ b/staging/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm new file mode 100644 index 000000000..799d58f4b --- /dev/null +++ b/staging/kdebase-workspace/kdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/kdm) +case "$1" in + start) + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch new file mode 100644 index 000000000..f5fc0e571 --- /dev/null +++ b/staging/kdebase-workspace/kdm-xinitrd.patch @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/staging/kdebase-workspace/kscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch new file mode 100644 index 000000000..094591317 --- /dev/null +++ b/staging/kdebase-workspace/terminate-server.patch @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD new file mode 100644 index 000000000..0ee312673 --- /dev/null +++ b/staging/kdegraphics-okular/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147710 2012-01-27 10:23:39Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-okular +pkgver=4.8.0 +pkgrel=2 +pkgdesc='Document Viewer' +arch=('i686' 'x86_64') +url="http://kde.org/applications/graphics/okular/" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') +makedepends=('cmake' 'automoc4') +optdepends=('kdegraphics-mobipocket: mobipocket support') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") +sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../okular-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdegraphics-okular/kdegraphics-okular.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD new file mode 100644 index 000000000..617716c8a --- /dev/null +++ b/staging/kdegraphics-strigi-analyzer/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147712 2012-01-27 10:35:31Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-strigi-analyzer +pkgver=4.8.0 +pkgrel=2 +pkgdesc="Strigi analyzers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/mjpegtools/PKGBUILD b/staging/mjpegtools/PKGBUILD new file mode 100644 index 000000000..8a43df518 --- /dev/null +++ b/staging/mjpegtools/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147692 2012-01-27 05:35:16Z eric $ +# Contributor: Damir Perisa +# Maintainer: Roberto Carvajal + +pkgname=mjpegtools +pkgver=2.0.0 +pkgrel=2 +pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" +arch=(i686 x86_64) +license=('GPL') +url="http://mjpeg.sourceforge.net/" +depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv') +makedepends=('gtk2' 'v4l-utils') +optdepends=('gtk2: glav GUI') +options=('!makeflags' '!libtool') +install=mjpegtools.install +source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz + mjpegtools-v4l-2.6.38.patch) +md5sums=('903e1e3b967eebcc5fe5626d7517dc46' + '44006d6f844017fe57aa123aa43f4508') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch" + sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure + ./configure --prefix=/usr --enable-largefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/" +} diff --git a/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch b/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch new file mode 100644 index 000000000..6adeb921c --- /dev/null +++ b/staging/mjpegtools/mjpegtools-v4l-2.6.38.patch @@ -0,0 +1,100 @@ +Index: lavtools/lavvideo.c +=================================================================== +--- lavtools/lavvideo.c.orig ++++ lavtools/lavvideo.c +@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler. + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include + + #include + #include +Index: lavtools/liblavplay.c +=================================================================== +--- lavtools/liblavplay.c.orig ++++ lavtools/liblavplay.c +@@ -68,7 +68,8 @@ + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + #else + #define VIDEO_MODE_PAL 0 + #define VIDEO_MODE_NTSC 1 +Index: lavtools/liblavrec.c +=================================================================== +--- lavtools/liblavrec.c.orig ++++ lavtools/liblavrec.c +@@ -63,7 +63,8 @@ + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + #ifdef HAVE_SYS_SOUNDCARD_H + #include + #endif +Index: lavtools/testrec.c +=================================================================== +--- lavtools/testrec.c.orig ++++ lavtools/testrec.c +@@ -89,7 +89,7 @@ + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include + #include + + /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit + AS_IF([test "x$with_v4l" != "xno"], [ + case $host in + *-*-linux*) +- AC_CHECK_HEADER(linux/videodev.h, ++ AC_CHECK_HEADER(libv4l1-videodev.h, + [have_video4linux=true + AC_DEFINE(HAVE_V4L, 1, + [Building for Linux - using the video4linux API])], []) +@@ -173,7 +173,7 @@ esac]) + + AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"], + [have_video4linux=false +- AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) ++ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) + AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) + + dnl ********************************************************************* +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then : + + case $host in + *-*-linux*) +- ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" + if test "x$ac_cv_header_linux_videodev_h" = xyes; then : + have_video4linux=true + +@@ -16407,8 +16407,8 @@ fi + + if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then : + have_video4linux=false +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 +-$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 ++$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} + fi + if test x$have_video4linux = xtrue; then + HAVE_V4L_TRUE= diff --git a/staging/mjpegtools/mjpegtools.install b/staging/mjpegtools/mjpegtools.install new file mode 100644 index 000000000..4d1231686 --- /dev/null +++ b/staging/mjpegtools/mjpegtools.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=mjpeg-howto.info + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} diff --git a/staging/scribus/PKGBUILD b/staging/scribus/PKGBUILD new file mode 100644 index 000000000..244d83f32 --- /dev/null +++ b/staging/scribus/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 147755 2012-01-28 03:27:34Z eric $ +# Contributor: Ronald van Haren +# Contributor: tobias +# Contributor: Ben +# Maintainer: Daniel J Griffiths + +pkgname=scribus +pkgver=1.4.0 +pkgrel=2 +pkgdesc="A desktop publishing program" +arch=('i686' 'x86_64') +url="http://www.scribus.net" +license=('GPL') +install=scribus.install +depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \ + 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \ + 'desktop-file-utils' 'shared-mime-info') +makedepends=('cmake') +options=(!libtool) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('ae19e62399941fb8e868d8e762caf494') +sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809') + +build() { + cd "${srcdir}" + sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + ${pkgname}-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/* + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DWANT_CAIRO=1 \ + -DLIB_SUFFIX="" + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + + # fix icon path in .desktop file + sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \ + "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" + + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/scribus.desktop" \ + "${pkgdir}/usr/share/applications/scribus.desktop" +} diff --git a/staging/scribus/scribus.install b/staging/scribus/scribus.install new file mode 100644 index 000000000..0598e46ed --- /dev/null +++ b/staging/scribus/scribus.install @@ -0,0 +1,13 @@ + +post_install() { + echo "update desktop mime database..." + update-mime-database usr/share/mime > /dev/null 2>&1 + update-desktop-database -q > /dev/null 2>&1 +} +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD index 82e0d15fc..e491cdff1 100644 --- a/staging/transcode/PKGBUILD +++ b/staging/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147020 2012-01-20 20:01:07Z giovanni $ +# $Id: PKGBUILD 147748 2012-01-27 20:04:27Z ibiru $ # Maintainer: # Contributor: Sarah Hay # Contributor: roberto @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=2 +pkgrel=4 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" @@ -17,14 +17,18 @@ makedepends=('nasm') options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch) + subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch + ffmpeg-0.10.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae') + '591943a33235342a66c3df0625a164a1479c09ae' + '3c03111cfae88db918afff3837cec7db32ace3cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/ffmpeg-0.10.patch" ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ diff --git a/staging/transcode/ffmpeg-0.10.patch b/staging/transcode/ffmpeg-0.10.patch new file mode 100644 index 000000000..5965c180c --- /dev/null +++ b/staging/transcode/ffmpeg-0.10.patch @@ -0,0 +1,14 @@ +diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c +--- transcode-1.1.7.orig/filter/filter_pp.c 2012-01-27 19:55:13.706613234 +0000 ++++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +0000 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD index 52303eec2..5da7ffc4f 100644 --- a/staging/vlc/PKGBUILD +++ b/staging/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147135 2012-01-22 12:28:59Z giovanni $ +# $Id: PKGBUILD 147741 2012-01-27 19:40:23Z ibiru $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.13 -pkgrel=2 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/testing/gmp/538dfce27f41.patch b/testing/gmp/538dfce27f41.patch new file mode 100644 index 000000000..2e0a1af50 --- /dev/null +++ b/testing/gmp/538dfce27f41.patch @@ -0,0 +1,38 @@ + +# HG changeset patch +# User Torbjorn Granlund +# Date 1310730221 -7200 +# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 +# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 +(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. + +diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c +--- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 ++++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 +@@ -7,7 +7,7 @@ + SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST + GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. + +-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. ++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. + +@@ -28,7 +28,6 @@ + #include "gmp-impl.h" + + +- + mp_size_t + mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) + { +@@ -130,7 +129,7 @@ + qn = nn - qn; + while (qn > dn) + { +- mpn_sub_1 (np + dn, np + dn, qn, cy); ++ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); + cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); + qp += dn; + np += dn; + diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD new file mode 100644 index 000000000..1915a7e6f --- /dev/null +++ b/testing/gmp/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 147720 2012-01-27 11:26:19Z allan $ +# Maintainer: Allan McRae +# Maintainer: Jan de Groot + +pkgname=gmp +pkgver=5.0.3 +pkgrel=1 +pkgdesc="A free library for arbitrary precision arithmetic" +arch=('i686' 'x86_64') +url="http://gmplib.org/" +depends=('gcc-libs' 'sh') +license=('LGPL3') +options=(!libtool) +install=gmp.install +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig}) +md5sums=('1e8edebe33bc3ac6de17df3201732825' + '9efbe14533ded9cd3ae4e998ee0efc98') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + [ "${CARCH}" = "i686" ] && export ABI="32" + ./configure --build=${CHOST} \ + --prefix=/usr --infodir=/usr/share/info \ + --enable-cxx + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gmp/gmp.install b/testing/gmp/gmp.install new file mode 100644 index 000000000..cad3354f9 --- /dev/null +++ b/testing/gmp/gmp.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(gmp.info gmp.info-1 gmp.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} -- cgit v1.2.3-54-g00ecf