From ec963aec4666ff7087ae150cb84398533a78f296 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 25 Mar 2014 03:59:45 +0000 Subject: Tue Mar 25 03:55:20 UTC 2014 --- extra/apache/PKGBUILD | 14 +++++------ extra/apache/apache.install | 10 +++++--- ...the_default_value_for_contrast_saturation.patch | 27 ---------------------- extra/libva-intel-driver/PKGBUILD | 17 ++++---------- extra/libva/PKGBUILD | 23 +++++++++--------- extra/live-media/PKGBUILD | 6 ++--- extra/nspr/PKGBUILD | 8 +++---- extra/nss/PKGBUILD | 6 ++--- extra/pango/PKGBUILD | 6 ++--- extra/ruby/PKGBUILD | 22 +++++++++++++----- extra/ruby/disable_sse2_on_i686.patch | 27 ++++++++++++++++++++++ extra/xf86-video-intel/PKGBUILD | 7 +++--- 12 files changed, 90 insertions(+), 83 deletions(-) delete mode 100644 extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch create mode 100644 extra/ruby/disable_sse2_on_i686.patch (limited to 'extra') diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index fd7b03f4e..7c936f9d5 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 207472 2014-03-10 15:55:51Z anatolik $ +# $Id: PKGBUILD 208547 2014-03-24 13:25:02Z anatolik $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apache -pkgver=2.4.7 -pkgrel=2 +pkgver=2.4.9 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') url='http://www.apache.org/dist/httpd' @@ -22,9 +22,9 @@ backup=( depends=('zlib' 'apr-util' 'pcre') makedepends=('libxml2' 'lua' 'openssl') optdepends=( - 'lua: for mod_lua support' - 'openssl: for mod_ssl support' - 'libxml2: for mod_xml2enc support' + 'lua: for mod_lua module' + 'openssl: for mod_ssl module' + 'libxml2: for mod_proxy_html, mod_xml2enc modules' 'lynx: apachectl status' ) install=apache.install @@ -35,7 +35,7 @@ source=( httpd.service arch.layout ) -sha256sums=('64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b' +sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603' 'SKIP' '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' diff --git a/extra/apache/apache.install b/extra/apache/apache.install index 3ca8cfcee..5665f08f6 100644 --- a/extra/apache/apache.install +++ b/extra/apache/apache.install @@ -1,12 +1,16 @@ post_install() { - type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create apache.conf + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create apache.conf + fi } post_upgrade() { - type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create apache.conf + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create apache.conf + fi if [[ $2 == 2\.2\.* ]]; then # it is a major upgrade, show a useful link to upgrade instructions - echo ' Check Apache upgrade instructions: https://httpd.apache.org/docs/trunk/upgrading.html' + echo ' Check Apache upgrade instructions: https://httpd.apache.org/docs/2.4/upgrading.html' fi } diff --git a/extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch b/extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch deleted file mode 100644 index ea3fc7c0a..000000000 --- a/extra/libva-intel-driver/Adjust_the_default_value_for_contrast_saturation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 54cb60f3d973ce6a908ea57f5aa7481803fe653a Mon Sep 17 00:00:00 2001 -From: Xiang, Haihao -Date: Mon, 30 Dec 2013 05:15:40 +0000 -Subject: Render: Adjust the default value for contrast/saturation - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73016 -Signed-off-by: Xiang, Haihao -Tested-by: Mark Lee ---- -diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h -index ccf9a59..773c8ca 100644 ---- a/src/i965_drv_video.h -+++ b/src/i965_drv_video.h -@@ -60,9 +60,9 @@ - #define I965_SURFACE_FLAG_BOTTOME_FIELD_FIRST 0x00000002 - - #define DEFAULT_BRIGHTNESS 0 --#define DEFAULT_CONTRAST 10 -+#define DEFAULT_CONTRAST 50 - #define DEFAULT_HUE 0 --#define DEFAULT_SATURATION 10 -+#define DEFAULT_SATURATION 50 - - struct i965_surface - { --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index efbef8f37..7a4572436 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,25 +1,18 @@ -# $Id: PKGBUILD 203091 2014-01-04 08:08:06Z bpiotrowski $ +# $Id: PKGBUILD 208594 2014-03-24 15:38:58Z bpiotrowski $ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski pkgname=libva-intel-driver -pkgver=1.2.2 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family' arch=('i686' 'x86_64') url='http://freedesktop.org/wiki/Software/vaapi' license=('MIT') depends=('libva') replaces=('libva-driver-intel') -source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2 - Adjust_the_default_value_for_contrast_saturation.patch) -sha1sums=('ece479b51926764edd2be6599f9c067cae2a3942' - 'f2c2c40512b8c209dc7aefb8b20ad02bb9471a3f') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../Adjust_the_default_value_for_contrast_saturation.patch -} +source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('26d5cb188b93e415e70ee662aad924f1') build() { cd $pkgname-$pkgver diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index 295c7fa1a..a53c119de 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 207458 2014-03-09 21:12:42Z lcarlier $ -# Maintainer : Ionut Biru +# $Id: PKGBUILD 208592 2014-03-24 15:32:22Z bpiotrowski $ +# Maintainer: Ionut Biru +# Maintainer: Bartłomiej Piotrowski pkgname=libva -pkgver=1.2.1 -pkgrel=2 -pkgdesc="Video Acceleration (VA) API for Linux" +pkgver=1.3.0 +pkgrel=1 +pkgdesc='Video Acceleration (VA) API for Linux' arch=('i686' 'x86_64') -url="http://freedesktop.org/wiki/Software/vaapi" +url='http://freedesktop.org/wiki/Software/vaapi' license=('MIT') depends=('libgl' 'libdrm' 'libxfixes') makedepends=('mesa') optdepends=('libva-vdpau-driver: vdpau back-end for nvidia' 'libva-intel-driver: back-end for intel cards') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('f716a4cadd670b14f44a2e833f96a2c509956339') +md5sums=('471bef887e92437914a7e1f799995570') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } - -# vim:set ts=2 sw=2 et: diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index e7b268a4e..9a13af884 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 206500 2014-02-28 17:30:37Z giovanni $ +# $Id: PKGBUILD 208633 2014-03-24 18:14:14Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2014.02.26 +pkgver=2014.03.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://live555.com/liveMedia" depends=('gcc-libs') options=('staticlibs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('db00af2b661795b3d31094951975b4ea') +md5sums=('2020012b2dfc66972a29a89a95f369a8') build() { cd ${srcdir}/live diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 3bd171c72..08c13577a 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 205067 2014-02-04 10:50:56Z jgc $ +# $Id: PKGBUILD 208548 2014-03-24 13:25:02Z anatolik $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=nspr -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,8 +13,8 @@ depends=('glibc') makedepends=('zip') options=('!emptydirs') source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('afcb28ed2b159cb059141bdf5f2e001374a845cf') -md5sums=('bf298e874cf454a3c2f8fe7e671c5d2e') +md5sums=('db8e5c40dadcf3f71a20c01f503c573a') +sha1sums=('43b2029d990515f952c89d2921397c064fbbe2e7') build() { cd $pkgname-$pkgver diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 73004fee8..7c7c78356 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 204787 2014-01-27 08:27:12Z jgc $ +# $Id: PKGBUILD 208549 2014-03-24 13:25:04Z anatolik $ # Maintainer: Jan de Groot pkgname=nss -pkgver=3.15.4 +pkgver=3.15.5 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) @@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('c164fac83fcbaff010786767e2a858ca23a89a5b' +sha1sums=('c8d34a33cf5782d35df1aa78cdb38707d7bfc5fe' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index d73ad4c59..37913178a 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 205450 2014-02-05 06:13:22Z heftig $ +# $Id: PKGBUILD 208542 2014-03-24 13:16:07Z jgc $ # Maintainer: Jan de Groot pkgname=pango -pkgver=1.36.2 +pkgver=1.36.3 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introsp install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('f07f9392c9cf20daf5c17a210b2c3f3823d517e1917b72f20bb19353b2bc2c63') +sha256sums=('ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22') build() { cd ${pkgname}-${pkgver} diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index d2885050b..94768c1e1 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('ruby' 'ruby-docs') pkgver=2.1.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') @@ -16,18 +16,28 @@ makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk' options=('!emptydirs' '!makeflags' 'staticlibs') source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.bz2" 'gemrc' + 'disable_sse2_on_i686.patch' '0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch') -md5sums=('53edc33b2f590ecdd9f6a344b9d92d0d' - '6fb8e7a09955e0f64be3158fb4a27e7a' - '0496e962e0ce11507b7577a8eb93af58') +sha1sums=('a7fd539f64864bc00fc64444d2d814df6c19fd4a' + 'de4b760b7e2cd9af88ca67536ce37b950f1ee514' + '92592bca7e4bbe760202b1bc356a8e3a1a9446b5' + '52e10cb0577c1281c664e0f34b51053ef7644f33') -build() { + +prepare() { cd ruby-${pkgver} # readline 6.3 doesn't define Function anymore # https://bugs.ruby-lang.org/issues/9578 patch -Np1 -i ${srcdir}/0001-Fix-undeclared-identifier-error-by-using-the-actual-.patch + # FS#39470 + patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch +} + +build() { + cd ruby-${pkgver} + PKG_CONFIG=/usr/bin/pkg-config ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -46,7 +56,7 @@ check() { package_ruby() { pkgdesc='An object-oriented language for quick and easy programming' - depends=('gdbm' 'openssl' 'libffi' 'libyaml') + depends=('gdbm' 'openssl' 'libffi' 'libyaml' 'gmp' 'zlib') optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK' provides=('rubygems' 'rake') conflicts=('rake') diff --git a/extra/ruby/disable_sse2_on_i686.patch b/extra/ruby/disable_sse2_on_i686.patch new file mode 100644 index 000000000..45eda4484 --- /dev/null +++ b/extra/ruby/disable_sse2_on_i686.patch @@ -0,0 +1,27 @@ +diff --git a/configure.in b/configure.in +index e952cc7..e5f86cc 100644 +--- a/configure.in ++++ b/configure.in +@@ -868,22 +868,6 @@ if test "$GCC" = yes; then + for oflag in -fno-fast-math; do + RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)]) + done +- AS_CASE(["$target"], +- [*-darwin*], [ +- # doesn't seem necessary on Mac OS X +- ], +- [[i[4-6]86*]], [ +- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [ +- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse) +- ]) +- AS_CASE(["$XCFLAGS"], +- [[*-msse2*]], [ +- RUBY_TRY_CFLAGS(-mstackrealign, [ +- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign) +- ]) +- ]) +- ] +- ) + fi + + AC_ARG_WITH(opt-dir, diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index d558bb760..cea87f2d6 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 205820 2014-02-10 15:26:51Z lcarlier $ +# $Id: PKGBUILD 208571 2014-03-24 15:08:58Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.99.910 +pkgver=2.99.911 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -24,11 +24,12 @@ conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERS 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('203d46064449da0e23a111418dfb189422ba96ea08707167c8dee463e2d745b1') +sha256sums=('4e7a68491bcc4d49912c5ec3ee688badce3f929ce1b7618ede9d8001827270d6') build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ --enable-glamor make } -- cgit v1.2.3-54-g00ecf