diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-10 23:13:07 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-10 23:13:07 +0000 |
| commit | 139460a7a8b085588b699c488fd19b166db18a74 (patch) | |
| tree | c7ef8dc756803db980465dd7bc9186f9c642aa50 /extra | |
| parent | d1e588afc2779754c0abd1122ecf4f8e3c863d7a (diff) | |
Sun Jul 10 23:13:07 UTC 2011
Diffstat (limited to 'extra')
32 files changed, 777 insertions, 221 deletions
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index cee3fc185..89fa98ad1 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110738 2011-02-21 22:15:44Z schiv $ +# $Id: PKGBUILD 130903 2011-07-08 19:43:04Z schiv $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,29 +9,41 @@ pkgname=ardour pkgver=2.8.11 -pkgrel=3 +pkgrel=4 pkgdesc="A multichannel hard disk recorder and digital audio workstation" arch=('i686' 'x86_64') url="http://ardour.org" license=('GPL') -depends=('liblrdf>=0.4.0-7' 'liblo' 'aubio' 'libusb-compat' - 'slv2>=0.6.6-3' 'rubberband' 'libgnomecanvas') +depends=('liblrdf' 'liblo' 'aubio' 'libusb-compat' + 'libgnomecanvasmm' 'soundtouch') + # -rubberband -libgnomecanvas(+libgnomecanvasmm) + # +soundtouch -slv2 makedepends=('scons' 'boost' 'pkg-config') changelog=${pkgname}.changelog source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 - ${pkgname}.desktop) + ${pkgname}.desktop + gcc46.patch) md5sums=('f451a8d0abc133a1700c3932e07a5612' - '8aeaf433ebf781733db48e5a16b0c4da') + '8aeaf433ebf781733db48e5a16b0c4da' + 'd709add59911d099c813162448e4db99') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # gcc 4.6 compatibility + patch -Np1 -i "$srcdir/gcc46.patch" + sed -i '/-O3/d' SConstruct + # use syslibs until internal sigc++ issue w/ latest gcc resolves + # TODO: report upstream scons ${MAKEFLAGS} ARCH="${CFLAGS}" \ PREFIX="/usr" \ DIST_LIBDIR="lib" \ FREEDESKTOP=0 \ FREESOUND=1 \ + SYSLIBS=1 \ + LV2=0 \ DESTDIR="${pkgdir}" } @@ -41,10 +53,13 @@ package() { scons PREFIX="/usr" \ FREEDESKTOP=0 \ FREESOUND=1 \ + SYSLIBS=1 \ + LV2=0 \ DESTDIR="${pkgdir}" install # install some freedesktop.org compatibility - install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" } # vim:set ts=2 sw=2 et: diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog index ee9cf00bf..69d289e8f 100644 --- a/extra/ardour/ardour.changelog +++ b/extra/ardour/ardour.changelog @@ -1,7 +1,18 @@ +9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-4: + Fix build failures and runtime segfaults + - gcc 4.6 patch + - enable SYSLIBS due to ardour sigc++ issues + - remove slv2 dep due to ardour rasqal incompatibility [1][2] + + [1] https://bugs.archlinux.org/task/25060 + [2] https://ardour.org/node/4301 + 22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> * 2.8.11-2 : - raptor rebuild + raptor rebuild 9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> @@ -21,6 +32,7 @@ * ardour.changelog : Added this changelog. + Only important changes will be logged. * ardour.install : Removed install scriptlet; old and deprecated information. diff --git a/extra/ardour/gcc46.patch b/extra/ardour/gcc46.patch new file mode 100644 index 000000000..d01610d1d --- /dev/null +++ b/extra/ardour/gcc46.patch @@ -0,0 +1,42 @@ +diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc ardour-2.8.11/libs/ardour/enums.cc +--- ardour-2.8.11.old/libs/ardour/enums.cc 2010-04-20 13:28:37.000000000 -0400 ++++ ardour-2.8.11/libs/ardour/enums.cc 2011-02-13 11:23:02.000000000 -0500 +@@ -31,7 +31,8 @@ + + using namespace std; + using namespace PBD; +-using namespace ARDOUR; ++namespace ARDOUR ++{ + + void + setup_enum_writer () +@@ -362,3 +363,5 @@ setup_enum_writer () + REGISTER (_Track_FreezeState); + + } ++ ++} +diff -rupN ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h +--- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h 2009-03-26 10:25:40.000000000 -0400 ++++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h 2011-02-09 21:41:04.000000000 -0500 +@@ -19,6 +19,7 @@ + #define RUBBERBAND_API_MAJOR_VERSION 2 + #define RUBBERBAND_API_MINOR_VERSION 0 + ++#include <cstddef> + #include <vector> + + /** +diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc +--- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc 2009-02-24 07:38:19.000000000 -0500 ++++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc 2011-02-13 11:23:24.000000000 -0500 +@@ -177,7 +177,7 @@ wiimote_discovery: + std::cerr << "Wiimote: discovering, press 1+2" << std::endl; + + while (!wiimote_handle && !main_thread_quit) { +- bdaddr = *BDADDR_ANY; ++ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}}; + callback_thread_registered_for_ardour = false; + wiimote_handle = cwiid_open(&bdaddr, 0); + diff --git a/extra/blas/LICENSE.blas b/extra/blas/LICENSE.blas new file mode 100644 index 000000000..79f38386e --- /dev/null +++ b/extra/blas/LICENSE.blas @@ -0,0 +1,19 @@ +From: http://www.netlib.org/blas/faq.html + + 2) Are there legal restrictions on the use of BLAS reference + implementation software? + +The reference BLAS is a freely-available software package. It is +available from netlib via anonymous ftp and the World Wide Web. Thus, +it can be included in commercial software packages (and has been). We +only ask that proper credit be given to the authors. + +Like all software, it is copyrighted. It is not trademarked, but we do +ask the following: + +If you modify the source for these routines we ask that you change the +name of the routine and comment the changes made to the original. + +We will gladly answer any questions regarding the software. If a +modification is done, however, it is the responsibility of the person +who modified the routine to provide support. diff --git a/extra/blas/Makefile.blas b/extra/blas/Makefile.blas new file mode 100644 index 000000000..e0d97793f --- /dev/null +++ b/extra/blas/Makefile.blas @@ -0,0 +1,148 @@ +include ../../make.inc + +####################################################################### +# This is the makefile to create a library for the BLAS. +# The files are grouped as follows: +# +# SBLAS1 -- Single precision real BLAS routines +# CBLAS1 -- Single precision complex BLAS routines +# DBLAS1 -- Double precision real BLAS routines +# ZBLAS1 -- Double precision complex BLAS routines +# +# CB1AUX -- Real BLAS routines called by complex routines +# ZB1AUX -- D.P. real BLAS routines called by d.p. complex +# routines +# +# ALLBLAS -- Auxiliary routines for Level 2 and 3 BLAS +# +# SBLAS2 -- Single precision real BLAS2 routines +# CBLAS2 -- Single precision complex BLAS2 routines +# DBLAS2 -- Double precision real BLAS2 routines +# ZBLAS2 -- Double precision complex BLAS2 routines +# +# SBLAS3 -- Single precision real BLAS3 routines +# CBLAS3 -- Single precision complex BLAS3 routines +# DBLAS3 -- Double precision real BLAS3 routines +# ZBLAS3 -- Double precision complex BLAS3 routines +# +# The library can be set up to include routines for any combination +# of the four precisions. To create or add to the library, enter make +# followed by one or more of the precisions desired. Some examples: +# make single +# make single complex +# make single double complex complex16 +# Note that these commands are not safe for parallel builds. +# +# Alternatively, the commands +# make all +# or +# make +# without any arguments creates a library of all four precisions. +# The name of the library is held in BLASLIB, which is set in the +# top-level make.inc +# +# To remove the object files after the library is created, enter +# make clean +# To force the source files to be recompiled, enter, for example, +# make single FRC=FRC +# +#--------------------------------------------------------------------- +# +# Edward Anderson, University of Tennessee +# March 26, 1990 +# Susan Ostrouchov, Last updated September 30, 1994 +# ejr, May 2006. +# +####################################################################### + +all: $(BLASLIB) + +#--------------------------------------------------------- +# Comment out the next 6 definitions if you already have +# the Level 1 BLAS. +#--------------------------------------------------------- +SBLAS1 = isamax.o sasum.o saxpy.o scopy.o sdot.o snrm2.o \ + srot.o srotg.o sscal.o sswap.o sdsdot.o srotmg.o srotm.o +$(SBLAS1): $(FRC) + +CBLAS1 = scabs1.o scasum.o scnrm2.o icamax.o caxpy.o ccopy.o \ + cdotc.o cdotu.o csscal.o crotg.o cscal.o cswap.o csrot.o +$(CBLAS1): $(FRC) + +DBLAS1 = idamax.o dasum.o daxpy.o dcopy.o ddot.o dnrm2.o \ + drot.o drotg.o dscal.o dsdot.o dswap.o drotmg.o drotm.o +$(DBLAS1): $(FRC) + +ZBLAS1 = dcabs1.o dzasum.o dznrm2.o izamax.o zaxpy.o zcopy.o \ + zdotc.o zdotu.o zdscal.o zrotg.o zscal.o zswap.o zdrot.o +$(ZBLAS1): $(FRC) + +CB1AUX = isamax.o sasum.o saxpy.o scopy.o snrm2.o sscal.o +$(CB1AUX): $(FRC) + +ZB1AUX = idamax.o dasum.o daxpy.o dcopy.o dnrm2.o dscal.o +$(ZB1AUX): $(FRC) + +#--------------------------------------------------------------------- +# The following line defines auxiliary routines needed by both the +# Level 2 and Level 3 BLAS. Comment it out only if you already have +# both the Level 2 and 3 BLAS. +#--------------------------------------------------------------------- +ALLBLAS = lsame.o xerbla.o xerbla_array.o +$(ALLBLAS) : $(FRC) + +#--------------------------------------------------------- +# Comment out the next 4 definitions if you already have +# the Level 2 BLAS. +#--------------------------------------------------------- +SBLAS2 = sgemv.o sgbmv.o ssymv.o ssbmv.o sspmv.o \ + strmv.o stbmv.o stpmv.o strsv.o stbsv.o stpsv.o \ + sger.o ssyr.o sspr.o ssyr2.o sspr2.o +$(SBLAS2): $(FRC) + +CBLAS2 = cgemv.o cgbmv.o chemv.o chbmv.o chpmv.o \ + ctrmv.o ctbmv.o ctpmv.o ctrsv.o ctbsv.o ctpsv.o \ + cgerc.o cgeru.o cher.o chpr.o cher2.o chpr2.o +$(CBLAS2): $(FRC) + +DBLAS2 = dgemv.o dgbmv.o dsymv.o dsbmv.o dspmv.o \ + dtrmv.o dtbmv.o dtpmv.o dtrsv.o dtbsv.o dtpsv.o \ + dger.o dsyr.o dspr.o dsyr2.o dspr2.o +$(DBLAS2): $(FRC) + +ZBLAS2 = zgemv.o zgbmv.o zhemv.o zhbmv.o zhpmv.o \ + ztrmv.o ztbmv.o ztpmv.o ztrsv.o ztbsv.o ztpsv.o \ + zgerc.o zgeru.o zher.o zhpr.o zher2.o zhpr2.o +$(ZBLAS2): $(FRC) + +#--------------------------------------------------------- +# Comment out the next 4 definitions if you already have +# the Level 3 BLAS. +#--------------------------------------------------------- +SBLAS3 = sgemm.o ssymm.o ssyrk.o ssyr2k.o strmm.o strsm.o +$(SBLAS3): $(FRC) + +CBLAS3 = cgemm.o csymm.o csyrk.o csyr2k.o ctrmm.o ctrsm.o \ + chemm.o cherk.o cher2k.o +$(CBLAS3): $(FRC) + +DBLAS3 = dgemm.o dsymm.o dsyrk.o dsyr2k.o dtrmm.o dtrsm.o +$(DBLAS3): $(FRC) + +ZBLAS3 = zgemm.o zsymm.o zsyrk.o zsyr2k.o ztrmm.o ztrsm.o \ + zhemm.o zherk.o zher2k.o +$(ZBLAS3): $(FRC) + +ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \ + $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \ + $(ZBLAS2) $(ZBLAS3) $(ALLBLAS) + +clean: + rm -f *.o libblas.a libblas.so* + +static: $(ALLOBJ) + ar ruv libblas.a $(ALLOBJ) + ranlib libblas.a + +shared: $(ALLOBJ) + cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.3.1 $(ALLOBJ) -lm -lgfortran -lc diff --git a/extra/blas/PKGBUILD b/extra/blas/PKGBUILD new file mode 100755 index 000000000..872e57bc7 --- /dev/null +++ b/extra/blas/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 130989 2011-07-09 12:22:58Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Jason Taylor <jftaylor21@gmail.com> + +pkgname=blas +pkgver=3.3.1 +pkgrel=2 +url="http://www.netlib.org/blas" +makedepends=('gcc-fortran') +depends=('gcc-libs') +pkgdesc="Basic Linear Algebra Subprograms" +arch=('i686' 'x86_64') +license=("custom") +source=(http://www.netlib.org/lapack/lapack-${pkgver}.tgz + lapack-3.1.1-make.inc.patch + Makefile.blas + LICENSE.blas) +sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac' + '71bf7696f1c841339163e82d863dd62e484eb1cf' + '3dbee0a5e9a98a2ddf5a58046f5997804e9874ed' + '2491a151a37f0162b25fc4e4e9a8ac444b574a76') + +build() { + cd "${srcdir}/lapack-${pkgver}" + cp -f "${srcdir}/Makefile.blas" BLAS/SRC/Makefile + patch -Np1 -i "${srcdir}/lapack-3.1.1-make.inc.patch" + cp -f INSTALL/make.inc.gfortran make.inc + + export FC=gfortran + + pushd BLAS/SRC + make clean + FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o + FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared + cp libblas.so.${pkgver} "${srcdir}/lapack-${pkgver}/" + + popd + ln -s libblas.so.${pkgver} libblas.so + +} + +package_blas() { + install -m755 -d "${pkgdir}/usr/lib" + install -m755 "${srcdir}/lapack-${pkgver}/libblas.so.${pkgver}" \ + "${pkgdir}/usr/lib/" + ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so" + ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so.3" + + install -m755 -d "${pkgdir}/usr/share/licenses/blas" + install -m644 "${srcdir}/LICENSE.blas" \ + "${pkgdir}/usr/share/licenses/blas/LICENSE" +} + diff --git a/extra/blas/lapack-3.1.1-make.inc.patch b/extra/blas/lapack-3.1.1-make.inc.patch new file mode 100644 index 000000000..c807ccbf9 --- /dev/null +++ b/extra/blas/lapack-3.1.1-make.inc.patch @@ -0,0 +1,23 @@ +--- lapack-3.1.1/INSTALL/make.inc.gfortran.BAD 2007-05-25 15:34:55.000000000 -0500 ++++ lapack-3.1.1/INSTALL/make.inc.gfortran 2007-05-25 15:35:51.000000000 -0500 +@@ -8,7 +8,7 @@ SHELL = /bin/sh + # + # The machine (platform) identifier to append to the library names + # +-PLAT = _LINUX ++PLAT = + # + # Modify the FORTRAN and OPTS definitions to refer to the + # compiler and desired compiler options for your machine. NOOPT +@@ -17,9 +17,9 @@ PLAT = _LINUX + # desired load options for your machine. + # + FORTRAN = gfortran +-OPTS = -O2 ++#OPTS = -O2 + DRVOPTS = $(OPTS) +-NOOPT = -O0 ++NOOPT = + LOADER = gfortran + LOADOPTS = + # diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 93b61ee16..fc4170c95 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,64 +1,40 @@ -# $Id: PKGBUILD 130311 2011-07-04 22:01:41Z eric $ +# $Id: PKGBUILD 131074 2011-07-10 02:10:18Z eric $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint -_srcver=0.22-1 -pkgver=${_srcver/-/.} -pkgrel=8 -pkgdesc="Sophisticated graphics manipulation programm supporting >8bit pictures" +pkgver=0.25.0 +pkgrel=1 +pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" -depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxpm>=3.5.7' 'fltk' - 'desktop-file-utils' 'ftgl>=2.1.3rc5') +depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'desktop-file-utils') makedepends=('python2' 'gutenprint') optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins') options=('!libtool') install=cinepaint.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz - LICENSE - cinepaint-0.22.1-gcc43.patch - cinepaint-0.22.1-multiple_parameters_named.patch - cinepaint-0.22.1-ambiguousawake.patch - cinepaint-0.22-gcc44.patch) -md5sums=('f360587240db6b6d2f0bfd94c420c492' +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + LICENSE cinepaint-0.22-gcc44.patch) +md5sums=('6ac099e3bc543e2460dfbffa7411d477' '169085743f667c250ea2e4022efecf5f' - 'f05e17a16d0018e5301aff0e1fa597b0' - '0876510a5ce3d581ebdde7e18199c09f' - '4586aa153a0d3cac36120afc1f95a880' '368e820c27f525e3569d43388f1c119a') build() { - cd "${srcdir}/${pkgname}-${_srcver}" - # FIXES - patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" - patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" - patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" - patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + - find plug-ins/print -type f -exec sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \; - sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' lib/fl_i18n/fl_i18n.cxx - sed -i 's|Fl/Fl_Widget.H|FL/Fl_Widget.H|' plug-ins/icc_examin/icc_examin/icc_helfer.h - sed -i 's|Fl/Fl.H|FL/Fl.H|' plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp - sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' plug-ins/icc_examin/icc_examin/fl_i18n/fl_i18n.cxx + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in - # Fix insecure rpath - sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure - - # build - ./configure --prefix=/usr --mandir=/usr/share/man \ - --enable-gtk2 --enable-pygimp \ - --with-python=/usr/bin/python2 - # FIXES - sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile + ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ + --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 make } package() { - cd "${srcdir}/${pkgname}-${_srcver}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - sed -i -e "s|-I$srcdir/cinepaint-0.22-1||" -e "s|-I$srcdir/cinepaint-0.22-1/lib||" -e "/libcinepaint.la/d" \ - -e "s|$srcdir/cinepaint-0.22-1/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" + sed -i -e "s|-I$srcdir/cinepaint-$pkgver||" -e "s|-I$srcdir/cinepaint-$pkgver/lib||" -e "/libcinepaint.la/d" \ + -e "s|$srcdir/cinepaint-$pkgver/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD index 119a2a1d9..28d6e8fe1 100644 --- a/extra/dvdrip/PKGBUILD +++ b/extra/dvdrip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126069 2011-06-01 10:23:05Z foutrelis $ +# $Id: PKGBUILD 130924 2011-07-09 05:42:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> pkgname=dvdrip pkgver=0.98.11 -pkgrel=8 +pkgrel=9 pkgdesc="A Gtk frontend for transcode writen in Perl" arch=('i686' 'x86_64') license=('custom') @@ -13,7 +13,8 @@ install=${pkgname}.install depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') optdepends=('ogmtools: for ogm/odd video creation' - 'lsdvd: fast reading of DVD table') + 'lsdvd: fast reading of DVD table' + 'fping: for cluster support') source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \ ${pkgname}.desktop) options=('!emptydirs' '!makeflags') diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 409850594..e28a03f4c 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 68034 2010-02-10 15:03:09Z giovanni $ +# $Id: PKGBUILD 130929 2011-07-09 05:53:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping pkgver=2.4b2 -pkgrel=3 +pkgrel=4 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') url="http://www.fping.com/" license=('custom') depends=('glibc') -source=(http://fping.sourceforge.net/download/fping.tar.gz) +source=("http://fping.sourceforge.net/download/${pkgname}.tar.gz") md5sums=('d5e8be59e307cef76bc479e1684df705') build() { cd $srcdir/$pkgname-$pkgver\_to ./configure --prefix=/usr \ - --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" || return 1 + --mandir=/usr/share/man + make +} + +package() { + cd $srcdir/$pkgname-$pkgver\_to + + make DESTDIR="${pkgdir}" install + + # install license + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" chmod 4755 ${pkgdir}/usr/sbin/fping } diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD index e78080979..eda29fb4c 100644 --- a/extra/gsl/PKGBUILD +++ b/extra/gsl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77275 2010-04-11 19:10:03Z ronald $ +# $Id: PKGBUILD 131001 2011-07-09 12:31:33Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Juergen Hoetzel <juergen.archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gsl -pkgver=1.14 +pkgver=1.15 pkgrel=1 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" url="http://www.gnu.org/software/gsl/gsl.html" @@ -14,7 +14,7 @@ license=('GPL') arch=('i686' 'x86_64') depends=('glibc' 'bash') options=('!libtool') -md5sums=('d55e7b141815412a072a3f0e12442042') +sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e') build() { unset LDFLAGS diff --git a/extra/hd2u/PKGBUILD b/extra/hd2u/PKGBUILD index 846ee3015..be78c1ea0 100644 --- a/extra/hd2u/PKGBUILD +++ b/extra/hd2u/PKGBUILD @@ -1,21 +1,27 @@ -# $Id: PKGBUILD 128435 2011-06-23 23:30:35Z dan $ +# $Id: PKGBUILD 130939 2011-07-09 06:15:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=hd2u pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Dos2Unix text file converter" arch=('i686' 'x86_64') license=('GPL2') url="http://hany.sk/~hany/software/hd2u/" depends=('popt') -source=(http://hany.sk/~hany/_data/hd2u/$pkgname-$pkgver.tgz) +source=("http://hany.sk/~hany/_data/hd2u/$pkgname-$pkgver.tgz") md5sums=('8f6668fafb279aa19f956ec0515717b6') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make - make prefix="$pkgdir/usr" install +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make BUILD_ROOT="$pkgdir" install } diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD index dfd3a6d13..b727cf225 100644 --- a/extra/hdf5/PKGBUILD +++ b/extra/hdf5/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122530 2011-05-04 11:32:45Z ronald $ +# $Id: PKGBUILD 130965 2011-07-09 08:59:26Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: damir <damir@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=hdf5 -pkgver=1.8.6 +pkgver=1.8.7 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data" @@ -15,7 +15,7 @@ depends=('zlib' 'sh') makedepends=('time') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -sha1sums=('348bd881c03a9568ac4ea9071833d6119c733757') +sha1sums=('be1daff26f066aca0b5be52d86dada6757fc4b95') build() { cd $srcdir/${pkgname}-${pkgver/_/-} diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index e1cf1b850..e0d40b332 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 114641 2011-03-15 00:30:43Z stephane $ +# $Id: PKGBUILD 130527 2011-07-07 11:15:35Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2 +pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') url="http://www.open-mpi.org/projects/hwloc/" @@ -14,8 +14,8 @@ depends=('sh') makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.1/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ca99f6e7c9cb41ca0ce89171c817c1de1d9bbde1') +source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('43886dfdddda5bfbaa841976275e7bf643453d7b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,9 +28,4 @@ package() { make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # Rename hwloc-gather-topology.sh script to be consistent with the upcoming version 1.2 - mv "${pkgdir}"/usr/bin/hwloc-gather-topology{.sh,} - mv "${pkgdir}"/usr/share/man/man1/hwloc-gather-topology{.sh.1,.1} - sed -i -e 's/hwloc-gather-topology.sh/hwloc-gather-topology/g' "${pkgdir}"/usr/share/man/man1/hwloc-gather-topology.1 } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 6a5ad62fd..7a6af847c 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125606 2011-05-26 21:06:33Z bisson $ +# $Id: PKGBUILD 130934 2011-07-09 05:54:52Z bisson $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape -pkgver=0.48.1 -pkgrel=3 +pkgver=0.48.2 +pkgrel=1 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64') @@ -13,21 +13,20 @@ license=('GPL' 'LGPL') makedepends=('boost' 'pkg-config' 'intltool') depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('python2-numpy: some extensions' +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' 'python-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gcc46.patch') -sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91' - '7163f35978538a6e223005737e8707b6f847fab3') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../gcc46.patch sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index 6a6cae983..7c5382565 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130267 2011-07-04 19:28:16Z andrea $ +# $Id: PKGBUILD 130960 2011-07-09 08:56:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -17,7 +17,7 @@ pkgname=('kdeutils-ark' 'kdeutils-superkaramba' 'kdeutils-sweeper') pkgver=4.6.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -25,11 +25,16 @@ groups=('kde' 'kdeutils') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-kcalc-keys.patch') +sha1sums=('1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb' + 'db87ec4d674a0979fc607f5b438e3e1c403b6eac') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p3 -i "${srcdir}"/fix-kcalc-keys.patch + + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdeutils/fix-kcalc-keys.patch b/extra/kdeutils/fix-kcalc-keys.patch new file mode 100644 index 000000000..a8046817c --- /dev/null +++ b/extra/kdeutils/fix-kcalc-keys.patch @@ -0,0 +1,92 @@ +--- trunk/KDE/kdeutils/kcalc/kcalc.ui 2011/07/06 18:27:29 1240129 ++++ trunk/KDE/kdeutils/kcalc/kcalc.ui 2011/07/06 18:27:58 1240130 +@@ -616,7 +616,7 @@ + <string>7</string> + </property> + <property name="shortcut"> +- <string notr="true">7</string> ++ <string>7</string> + </property> + </widget> + </item> +@@ -632,7 +632,7 @@ + <string>8</string> + </property> + <property name="shortcut"> +- <string notr="true">8</string> ++ <string>8</string> + </property> + </widget> + </item> +@@ -648,7 +648,7 @@ + <string>9</string> + </property> + <property name="shortcut"> +- <string notr="true">9</string> ++ <string>9</string> + </property> + </widget> + </item> +@@ -680,7 +680,7 @@ + <string>4</string> + </property> + <property name="shortcut"> +- <string notr="true">4</string> ++ <string>4</string> + </property> + </widget> + </item> +@@ -696,7 +696,7 @@ + <string>5</string> + </property> + <property name="shortcut"> +- <string notr="true">5</string> ++ <string>5</string> + </property> + </widget> + </item> +@@ -712,7 +712,7 @@ + <string>6</string> + </property> + <property name="shortcut"> +- <string notr="true">6</string> ++ <string>6</string> + </property> + </widget> + </item> +@@ -728,7 +728,7 @@ + <string>1</string> + </property> + <property name="shortcut"> +- <string notr="true">1</string> ++ <string>1</string> + </property> + </widget> + </item> +@@ -744,7 +744,7 @@ + <string>2</string> + </property> + <property name="shortcut"> +- <string notr="true">2</string> ++ <string>2</string> + </property> + </widget> + </item> +@@ -760,7 +760,7 @@ + <string>3</string> + </property> + <property name="shortcut"> +- <string notr="true">3</string> ++ <string>3</string> + </property> + </widget> + </item> +@@ -786,7 +786,7 @@ + <string>0</string> + </property> + <property name="shortcut"> +- <string notr="true">0</string> ++ <string>0</string> + </property> + </widget> + </item> diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack index 6e1f789c7..42579d43a 100644 --- a/extra/lapack/Makefile.lapack +++ b/extra/lapack/Makefile.lapack @@ -386,5 +386,5 @@ static: $(ALLOBJ) $(ALLXOBJ) ranlib liblapack.a shared: $(ALLOBJ) $(ALLXOBJ) - cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.0 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc + cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.3.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD index 6781a930e..ecc002737 100644 --- a/extra/lapack/PKGBUILD +++ b/extra/lapack/PKGBUILD @@ -1,45 +1,30 @@ -# $Id: PKGBUILD 108944 2011-02-05 09:11:28Z ronald $ +# $Id: PKGBUILD 131048 2011-07-09 21:48:17Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Jason Taylor <jftaylor21@gmail.com> -pkgbase=lapack -pkgname=('blas' 'lapack') -pkgver=3.3.0 +pkgname=lapack +pkgver=3.3.1 pkgrel=2 url="http://www.netlib.org/lapack" +pkgdesc="Linear Algebra PACKage" makedepends=('gcc-fortran') +depends=("blas=${pkgver}") arch=('i686' 'x86_64') license=("custom") -source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz +source=(http://www.netlib.org/${pkgname}/${pkgname}-${pkgver}.tgz lapack-3.1.1-make.inc.patch - Makefile.blas - Makefile.lapack - LICENSE.blas) -md5sums=('84213fca70936cc5f1b59a7b1bf71697' - 'cdfcb9d9b162c18d9acbf63c5579ea26' - '748440ae656402241d053dadb14425ee' - 'aa359e9b7cc717fb1230cfbb4e1d206b' - '38b6acb8ed5691d25863319d30a8b365') + Makefile.lapack) build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/lapack-3.1.1-make.inc.patch" cp -f INSTALL/make.inc.gfortran make.inc - cp -f "${srcdir}/Makefile.blas" BLAS/SRC/Makefile cp -f "${srcdir}/Makefile.lapack" SRC/Makefile export FC=gfortran - pushd BLAS/SRC - make clean - FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o - FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared - cp libblas.so.${pkgver} "${srcdir}/${pkgbase}-${pkgver}/" - popd - ln -s libblas.so.${pkgver} libblas.so - pushd INSTALL make clean make NOOPT="${CFLAGS/-O?/-O0} -fPIC" OPTS="${CFLAGS} -fPIC" @@ -50,35 +35,26 @@ build() { make clean make FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" shared - cp liblapack.so.${pkgver} "${srcdir}/${pkgbase}-${pkgver}/" + cp liblapack.so.${pkgver} "${srcdir}/${pkgname}-${pkgver}/" popd } -package_blas() { - pkgdesc="Basic Linear Algebra Subprograms" - depends=('gcc-libs') - options=('force') +package() { install -m755 -d "${pkgdir}/usr/lib" - install -m755 "${srcdir}/${pkgbase}-${pkgver}/libblas.so.${pkgver}" \ - "${pkgdir}/usr/lib/" - ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so" - ln -sf libblas.so.${pkgver} "${pkgdir}/usr/lib/libblas.so.3" - - install -m755 -d "${pkgdir}/usr/share/licenses/blas" - install -m644 "${srcdir}/LICENSE.blas" \ - "${pkgdir}/usr/share/licenses/blas/LICENSE" -} - -package_lapack() { - pkgdesc="Linear Algebra PACKage" - depends=("blas=${pkgver}") - install -m755 -d "${pkgdir}/usr/lib" - install -m755 "${srcdir}/${pkgbase}-${pkgver}/liblapack.so.${pkgver}" \ + install -m755 "${srcdir}/${pkgname}-${pkgver}/liblapack.so.${pkgver}" \ "${pkgdir}/usr/lib/" ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so" ln -sf liblapack.so.${pkgver} "${pkgdir}/usr/lib/liblapack.so.3" install -m755 -d "${pkgdir}/usr/share/licenses/lapack" - install -m644 "${srcdir}/${pkgbase}-${pkgver}/LICENSE" \ + install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ "${pkgdir}/usr/share/licenses/lapack/" } + +sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac' + '71bf7696f1c841339163e82d863dd62e484eb1cf' + '128a258fde1b923c0b0b958a8a8ae8aa7657e44b' + '2491a151a37f0162b25fc4e4e9a8ac444b574a76') +sha1sums=('3ce437e05f0e9a3c8148ec41922f6efeef0ebdac' + '71bf7696f1c841339163e82d863dd62e484eb1cf' + 'bbc51c4204cfc6a8aed1a0b61dc39f57ce801e6d') diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index ad728c47b..13f6451b7 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124982 2011-05-25 15:39:01Z ibiru $ +# $Id: PKGBUILD 130979 2011-07-09 11:00:04Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=1.6.10 +pkgver=2.0.0 pkgrel=1 pkgdesc="An advanced open-source document processor." arch=('i686' 'x86_64') @@ -11,9 +11,9 @@ url="http://www.lyx.org" depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus' 'boost-libs') makedepends=('boost') license=('GPL') -source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \ +source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz \ lyx.desktop) -sha1sums=('344e14897ea7d004bf181eac39355f1b08f0af83' +sha1sums=('27bf0ee623aae0e59780d9f627cdf5cb788a2516' 'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844') build() { @@ -34,3 +34,4 @@ package() { # install desktop entry install -Dm644 "${srcdir}/lyx.desktop" "${pkgdir}/usr/share/applications/lyx.desktop" } + diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD index 7b1c1e8c5..326e3483e 100644 --- a/extra/netcdf/PKGBUILD +++ b/extra/netcdf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122825 2011-05-06 11:10:26Z ronald $ +# $Id: PKGBUILD 131006 2011-07-09 12:58:02Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=netcdf -pkgver=4.1.2 +pkgver=4.1.3 pkgrel=1 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library" arch=("i686" "x86_64") @@ -12,7 +12,7 @@ depends=('gcc-libs' 'hdf5' 'gcc-fortran' 'curl') options=('!libtool' '!makeflags') license=('custom') source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz) -sha1sums=('ef42419b2afd99364e470813bc5b922a1a72a6de') +sha1sums=('e600322478276f51612e17cca3cda38489003f81') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index ce71a53e1..21ff40fe7 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120945 2011-04-27 18:09:04Z ronald $ +# $Id: PKGBUILD 131039 2011-07-09 20:49:15Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.4.0 -pkgrel=2 +pkgver=3.4.2 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" @@ -15,24 +15,22 @@ makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' 'umfpack: LU decomposition of some large sparse matrices') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" - octave-3.4.0-gcc46.patch) +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") options=('!emptydirs') #install=octave.install -sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8' - '791c905a80510783e5f9c556c12f02400887fbec') +sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5') build() { cd ${srcdir}/${pkgname}-${pkgver} - # fedora gcc46 patch - patch -Np1 -i ${srcdir}/octave-3.4.0-gcc46.patch - # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ + # Avoid build failure due to missing curl/types.h + sed -i "/curl\/types.h/d" src/DLD-FUNCTIONS/urlwrite.cc + ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static --disable-docs + --enable-shared --disable-static --disable-docs make } @@ -41,4 +39,8 @@ package(){ cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install + + # add octave library path to ld.so.conf.d + install -d ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/${pkgname}-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index b909207c7..893bb15dc 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,75 +1,110 @@ -# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $ +# $Id: PKGBUILD 130774 2011-07-07 23:14:56Z foutrelis $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> -pkgname=opencv +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.2.0 -pkgrel=5 +pkgver=2.3.0 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') -url="http://opencv.willowgarage.com" +url="http://opencv.willowgarage.com/" depends=('jasper' 'gstreamer0.10-base' 'openexr' 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'doxygen' - 'python2-numpy' 'eigen') -optdepends=('eigen' - 'python2-numpy') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('python2-numpy: Python 2.x interface' + 'eigen2') options=('!libtool') -source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2 - ptrcvcapture.patch - gcc46.patch - v4l_2.6.38.patch) -md5sums=('122c9ac793a46854ef2819fedbbd6b1b' - '461a8b1b0f2264521e13d9ae051d13be' - 'b5fb8d6786578ae7bf272615279e8865' - '82c8a8a76275acd4a73a4f8e948c3f78') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2" + 'pypkgpath_nondebian.patch') +md5sums=('dea5e9df241ac37f4439da16559e420d' + 'eb884bad665047276e80556e44043a43') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') build() { cd "$srcdir/$_realname-$pkgver" - # Please do not remove any patches from trunk # - - # fix v4l issue - #patch -Np0 -i "$srcdir/v4l-mmap.patch" - - # fix ffmpeg-related C++ issue - # see http://code.google.com/p/ffmpegsource/source/detail?r=311 - #export CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" - - # fix linking against highgui - # see https://bugs.archlinux.org/task/22841 - patch -Np0 -i "$srcdir/ptrcvcapture.patch" + # fix upstream's assumption of "debian-based" + patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch" - # gcc 4.6 compatibility - # see https://bugs.archlinux.org/task/23741 - patch -Np3 -i "$srcdir/gcc46.patch" + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} - # distro kernel no longer has v4l1 - # see https://bugs.archlinux.org/task/23826 - patch -Np1 -i "$srcdir/v4l_2.6.38.patch" + cmake ${_cmakeopts[@]} . - cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DWITH_XINE=ON \ - -DWITH_UNICAP=OFF \ - -DBUILD_EXAMPLES=ON \ - -DBUILD_TESTS=OFF \ - -DINSTALL_C_EXAMPLES=ON \ - -DINSTALL_PYTHON_EXAMPLES=ON make } -package() { +package_opencv() { + install=$pkgname.install + cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # separate docs package; also be -R friendly + [ -d "$pkgdir/usr/share/opencv/doc" ] && \ + mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc" + + # separate samples package + [ -d "$pkgdir/usr/share/opencv/samples" ] && \ + mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + #arch=('any') + depends=() + optdepends=() + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + #arch=('any') + depends=() + optdepends=() + options=() + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" } # vim:set ts=2 sw=2 et: diff --git a/extra/opencv/opencv.install b/extra/opencv/opencv.install new file mode 100644 index 000000000..7709a9cc3 --- /dev/null +++ b/extra/opencv/opencv.install @@ -0,0 +1,12 @@ +post_install() { + echo "==> Documentation and samples are in separate packages:" + echo + echo "* opencv-docs" + echo "* opencv-samples" +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/opencv/pypkgpath_nondebian.patch b/extra/opencv/pypkgpath_nondebian.patch new file mode 100644 index 000000000..7c2d44b09 --- /dev/null +++ b/extra/opencv/pypkgpath_nondebian.patch @@ -0,0 +1,16 @@ +diff -aur OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt +--- OpenCV-2.3.0.orig/CMakeLists.txt 2011-07-07 17:31:35.656946629 +0800 ++++ OpenCV-2.3.0/CMakeLists.txt 2011-07-07 17:40:34.110696242 +0800 +@@ -620,11 +620,7 @@ + string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") + if(UNIX) + set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) +- if(APPLE) +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") +- else() #debian based assumed, install to the dist-packages. +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") +- endif() ++ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") + endif() + if(WIN32) + get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 32d538665..c8b2eaf46 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 121049 2011-04-28 16:03:46Z stephane $ +# $Id: PKGBUILD 130580 2011-07-07 13:38:27Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.3 -pkgrel=3 +pkgrel=4 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" license=('custom') depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') +makedepends=('net-tools') options=(!libtool) source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) sha1sums=('669565c708deab82ad4069d82675b2020eb0e0c6') diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index 9e8f6d8b1..4837acf97 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108873 2011-02-04 15:03:02Z ronald $ +# $Id: PKGBUILD 131054 2011-07-09 22:10:28Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium -pkgver=0.10.6 +pkgver=0.11.0 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64") @@ -14,9 +14,9 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -md5sums=('daab49529f0ad76efe871b639ac79295' - 'b4f9ebd082c4e112c2bbfac9f2c8465d' - '134ab08e73f4f5d995a7931a7957b7a3') +sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' + 'c9cc79212542238227b5bd6af99f60fe056f4ab2' + 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -36,3 +36,6 @@ package() { install -Dm644 ${srcdir}/stellarium.png \ ${pkgdir}/usr/share/pixmaps/stellarium.png } +sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' + 'c9cc79212542238227b5bd6af99f60fe056f4ab2' + 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD index 78d5a7d61..8b1a81e6e 100644 --- a/extra/time/PKGBUILD +++ b/extra/time/PKGBUILD @@ -1,22 +1,33 @@ -# $Id: PKGBUILD 109750 2011-02-12 13:42:27Z stephane $ +# $Id: PKGBUILD 131069 2011-07-10 01:00:33Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: damir <damir@archlinux.org> pkgname=time pkgver=1.7 -pkgrel=4 +pkgrel=5 pkgdesc="Utility for monitoring a program's use of system resources" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/time.html" license=('GPL') depends=('glibc') install=time.install -source=(http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e38d2b8b34b1ca259cf7b053caac32b3') +source=(http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz + time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch) +sha1sums=('dde0c28c7426960736933f3e763320680356cc6a' + 'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5' + 'b2a909e1d92f7af1bc99a4524ad84d467ed79a06') + build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 + patch -Np1 -i ../time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + + # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 + patch -Np1 -i ../time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch ./configure --prefix=/usr --infodir=/usr/share/info make diff --git a/extra/time/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch b/extra/time/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch new file mode 100644 index 000000000..008f46c53 --- /dev/null +++ b/extra/time/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch @@ -0,0 +1,72 @@ +From 0d743a7d946fe176a07baf2586a6af0e867fd89c Mon Sep 17 00:00:00 2001 +From: H.J. Lu <hongjiu.lu@intel.com> +Date: Wed, 11 May 2011 16:19:55 +0200 +Subject: [PATCH] Recompute CPU usage at microsecond level + +If job finishes quickly, miliseconds arithmetic rounds to zero. If +that happens, recalculate CPU usage ratio with microsecond accuracy +to raise chance to get non-zero values. +--- + resuse.h | 2 ++ + time.c | 15 +++++++++++++++ + 2 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/resuse.h b/resuse.h +index 992143f..7a3ee66 100644 +--- a/resuse.h ++++ b/resuse.h +@@ -33,9 +33,11 @@ struct timeval + #if HAVE_SYS_RUSAGE_H + /* This rusage structure measures nanoseconds instead of microseconds. */ + # define TV_MSEC tv_nsec / 1000000 ++# define TV_USEC tv_nsec / 1000 + # include <sys/rusage.h> + #else + # define TV_MSEC tv_usec / 1000 ++# define TV_USEC tv_usec + # if HAVE_WAIT3 + # include <sys/resource.h> + # else +diff --git a/time.c b/time.c +index 43aec0b..96cfdde 100644 +--- a/time.c ++++ b/time.c +@@ -326,6 +326,8 @@ summarize (fp, fmt, command, resp) + { + unsigned long r; /* Elapsed real milliseconds. */ + unsigned long v; /* Elapsed virtual (CPU) milliseconds. */ ++ unsigned long ru; /* Elapsed real microseconds. */ ++ unsigned long vu; /* Elapsed virtual (CPU) microseconds. */ + + if (verbose) + { +@@ -350,6 +352,17 @@ summarize (fp, fmt, command, resp) + v = resp->ru.ru_utime.tv_sec * 1000 + resp->ru.ru_utime.TV_MSEC + + resp->ru.ru_stime.tv_sec * 1000 + resp->ru.ru_stime.TV_MSEC; + ++ if (r == 0 && v == 0) ++ { ++ ru = resp->elapsed.tv_usec; ++ vu = resp->ru.ru_utime.TV_USEC + resp->ru.ru_stime.TV_USEC; ++ } ++ else ++ { ++ ru = 0; ++ vu = 0; ++ } ++ + while (*fmt) + { + switch (*fmt) +@@ -408,6 +421,8 @@ summarize (fp, fmt, command, resp) + /* % cpu is (total cpu time)/(elapsed time). */ + if (r > 0) + fprintf (fp, "%lu%%", (v * 100 / r)); ++ else if (ru > 0) ++ fprintf (fp, "%lu%%", (vu * 100 / ru)); + else + fprintf (fp, "?%%"); + break; +-- +1.7.4.4 + diff --git a/extra/time/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch b/extra/time/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch new file mode 100644 index 000000000..1f68f9b1b --- /dev/null +++ b/extra/time/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch @@ -0,0 +1,32 @@ +From ad24a929bdcc15abae14a64ea21b821bcd8cb030 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Wed, 11 May 2011 15:19:11 +0200 +Subject: [PATCH] ru_maxrss is in kilobytes on Linux + +Since 2.6.32 Linux returns ru_maxrss in kilobytes. Not in pages. + +See http://lists.gnu.org/archive/html/bug-gnu-utils/2008-12/msg00047.html +for discussion. +--- + time.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/time.c b/time.c +index d15fee4..43aec0b 100644 +--- a/time.c ++++ b/time.c +@@ -395,7 +395,11 @@ summarize (fp, fmt, command, resp) + ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); + break; + case 'M': /* Maximum resident set size. */ ++#ifdef __linux__ ++ fprintf (fp, "%ld", resp->ru.ru_maxrss); ++#else + fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss)); ++#endif + break; + case 'O': /* Outputs. */ + fprintf (fp, "%ld", resp->ru.ru_oublock); +-- +1.7.4.4 + diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 0f4d40330..b981b5987 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $ +# $Id: PKGBUILD 131034 2011-07-09 20:09:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=vigra pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Computer vision library" arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') -depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw') +depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') optdepends=('python2: for python bindings' 'boost-libs: for python bindings') diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 7448e3fb5..61b80c955 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125806 2011-05-30 08:22:14Z jgc $ +# $Id: PKGBUILD 130970 2011-07-09 09:10:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -11,7 +11,7 @@ url="http://xorg.freedesktop.org" makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - git-fixes.patch + #git-fixes.patch bg-none-revert.patch xserver-1.10-pointer-barriers.patch xorg-redhat-die-ugly-pattern-die-die-die.patch @@ -19,8 +19,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('fd831b3c6297d1a68830c602d767752d87b9ca54' - '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695' +sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' + # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695' '629c6d8d52126eab81ee1b72a9e4209535f8cb81' '1b95e91384a57d966428c7db98ed06f4cc562f91' '0efcdf61bde3c0cd813072b94e2b30ab922775b9' @@ -41,7 +41,7 @@ build() { patch -Np1 -i "${srcdir}/bg-none-revert.patch" # Upstream fixes from 1.10 branch - patch -Np1 -i "${srcdir}/git-fixes.patch" + #patch -Np1 -i "${srcdir}/git-fixes.patch" # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" |