diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/chromaprint/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/chromaprint/ffmpeg.patch | 21 | ||||
| -rw-r--r-- | extra/gummiboot/PKGBUILD | 41 | ||||
| -rw-r--r-- | extra/gummiboot/arch.conf | 7 | ||||
| -rw-r--r-- | extra/gummiboot/gummiboot.install | 11 | ||||
| -rw-r--r-- | extra/gummiboot/loader.conf | 2 | ||||
| -rw-r--r-- | extra/lsof/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/ntfs-3g_ntfsprogs/PKGBUILD | 44 | ||||
| -rw-r--r-- | extra/xfdesktop/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch | 108 |
10 files changed, 225 insertions, 42 deletions
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index 6b4fd53e4..b783485f8 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 178127 2013-02-16 22:48:46Z ioni $ +# $Id: PKGBUILD 179542 2013-03-06 13:51:08Z bisson $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=3 +pkgrel=4 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64') license=('LGPL') depends=('ffmpeg') makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2' + '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../ffmpeg.patch + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/chromaprint/ffmpeg.patch b/extra/chromaprint/ffmpeg.patch new file mode 100644 index 000000000..4c41ca664 --- /dev/null +++ b/extra/chromaprint/ffmpeg.patch @@ -0,0 +1,21 @@ +diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c +--- old/examples/fpcalc.c 2012-09-06 04:05:36.000000000 +1000 ++++ new/examples/fpcalc.c 2013-03-07 00:43:11.950928188 +1100 +@@ -65,6 +65,9 @@ + goto done; + } + ++ /* request regular signed 16-bit packed format */ ++ codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; ++ + if (avcodec_open(codec_ctx, codec) < 0) { + fprintf(stderr, "ERROR: couldn't open the codec\n"); + goto done; +@@ -146,6 +149,7 @@ + int ostride[6] = { 2 }; + int len = buffer_size / istride[0]; + if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { ++ fprintf(stderr, "WARNING: unable to convert %d samples\n", buffer_size); + break; + } + buffer = buffer2; diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD new file mode 100644 index 000000000..7c28a74b3 --- /dev/null +++ b/extra/gummiboot/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 179523 2013-03-06 00:31:31Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Mantas MikulÄ—nas <grawity@gmail.com> + +pkgname="gummiboot" +pkgver="24" +pkgrel="1" +pkgdesc="Simple text-mode UEFI Boot Manager" +url="http://freedesktop.org/wiki/Software/gummiboot" +arch=('x86_64' 'i686') +license=('LGPL2.1') +makedepends=('gnu-efi-libs') +depends=('util-linux') +conflicts=('gummiboot-efi') +provides=('gummiboot-efi') +replaces=('gummiboot-efi') +options=('!strip') +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz" + 'loader.conf' + 'arch.conf') +install="gummiboot.install" + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + make +} + +package() { + ## Install gummiboot example configuration files (can go away with systemd's kernel-install) + install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf" + install -D -m0644 "${srcdir}/arch.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/arch.conf" + + cd "${srcdir}/${pkgname}-${pkgver}/" + make DESTDIR="${pkgdir}" install +} +md5sums=('6fe2f9fb9f9a61f37612a8120ea42c1f' + '6ea803e5179d623716e3be0b636de658' + '82bda9612e3a361a74cf8de2a0134b15') diff --git a/extra/gummiboot/arch.conf b/extra/gummiboot/arch.conf new file mode 100644 index 000000000..6cf347026 --- /dev/null +++ b/extra/gummiboot/arch.conf @@ -0,0 +1,7 @@ +## This is just an exmaple config file. +## Please edit the paths and kernel parameters according to your system. + +title Arch Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/extra/gummiboot/gummiboot.install b/extra/gummiboot/gummiboot.install new file mode 100644 index 000000000..8b03623b9 --- /dev/null +++ b/extra/gummiboot/gummiboot.install @@ -0,0 +1,11 @@ +post_install() { + /usr/bin/gummiboot install +} + +post_upgrade() { + /usr/bin/gummiboot update +} + +pre_remove() { + /usr/bin/gummiboot remove +} diff --git a/extra/gummiboot/loader.conf b/extra/gummiboot/loader.conf new file mode 100644 index 000000000..75b67e0d5 --- /dev/null +++ b/extra/gummiboot/loader.conf @@ -0,0 +1,2 @@ +timeout 10 +default arch diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index 2c7f38411..a50746dc0 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157359 2012-04-27 22:32:41Z tomegun $ +# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,7 +6,7 @@ # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=lsof -pkgver=4.86 +pkgver=4.87 pkgrel=1 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64') @@ -40,5 +40,5 @@ package() { install -D -m0644 -o root -g root ${srcdir}/license.txt \ ${pkgdir}/usr/share/licenses/lsof/LICENSE } -md5sums=('9f1cda41f35add068c7b81f873fa56b5' +md5sums=('80e2a76d0e05826db910ec88e631296c' '1b63c76bd10437cabf890508c8e58d36') diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index 00622cbaf..efe13d040 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 176861 2013-02-01 21:35:19Z eric $ +# $Id: PKGBUILD 179546 2013-03-06 15:52:21Z eric $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bächler <thomas.archlinux.org> pkgbase=ntfs-3g_ntfsprogs -pkgname=('ntfs-3g' 'ntfsprogs') +pkgname=ntfs-3g pkgver=2013.1.13 -pkgrel=1 -url="http://www.tuxera.com/community/ntfs-3g-download/" +pkgrel=2 +pkgdesc="NTFS filesystem utilities" arch=('i686' 'x86_64') +url="http://www.tuxera.com/community/ntfs-3g-download/" license=('GPL2') -depends=('glibc' 'fuse') +depends=('util-linux' 'fuse') +conflicts=('ntfsprogs') +provides=('ntfsprogs') +replaces=('ntfsprogs') options=('!libtool') source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz) sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818') build() { cd "$srcdir/$pkgbase-$pkgver" + sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in ./configure --prefix=/usr \ --with-fuse=external --disable-static \ --enable-posix-acls --disable-ldconfig \ @@ -25,30 +30,7 @@ build() { } package_ntfs-3g() { - pkgdesc="Stable read and write NTFS driver" - - for DIR in src libntfs-3g include; do - cd "$srcdir/$pkgbase-$pkgver/$DIR" - make DESTDIR="$pkgdir" install - done - - mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/ - rm -rf "$pkgdir"/{s,}bin - rmdir "$pkgdir/lib" - - cd "$pkgdir"/usr/bin - ln -s ntfs-3g mount.ntfs - ln -s ntfs-3g mount.ntfs-3g - ln -s lowntfs-3g mount.lowntfs-3g -} - -package_ntfsprogs() { - pkgdesc="NTFS filesystem utilities" - depends=('util-linux' 'ntfs-3g') - - cd "$srcdir/$pkgbase-$pkgver/ntfsprogs" - make DESTDIR="$pkgdir" install - - mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/ - rm -rf "$pkgdir"/sbin + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install + ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs" } diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 1b999453e..c72c40d06 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179291 2013-03-04 21:25:21Z foutrelis $ +# $Id: PKGBUILD 179526 2013-03-06 02:34:29Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -16,12 +16,18 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + revert-SVG-images-are-no-longer-pixilated-when-scale.patch) +sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad' + '94274832eede98a7d99652ff90ecabd932b46b0f002c25297ddd6f0c346aa3d0') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix hang when solid color is selected + # https://bugzilla.xfce.org/show_bug.cgi?id=9892 + patch -Np1 -i "$srcdir/revert-SVG-images-are-no-longer-pixilated-when-scale.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch b/extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch new file mode 100644 index 000000000..020888a2b --- /dev/null +++ b/extra/xfdesktop/revert-SVG-images-are-no-longer-pixilated-when-scale.patch @@ -0,0 +1,108 @@ +From 8c868b20f3e19871f3f09e972cd20dbe3640084a Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Wed, 6 Mar 2013 04:27:07 +0200 +Subject: [PATCH] Revert "SVG images are no longer pixilated when scaled up" + +This reverts commit ebad377e5cd067cec9f2b402dff4991ddc4cc3b5. +--- + src/xfce-backdrop.c | 38 +++++++++++++++++--------------------- + 1 file changed, 17 insertions(+), 21 deletions(-) + +diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c +index 9a4d7db..b07492f 100644 +--- a/src/xfce-backdrop.c ++++ b/src/xfce-backdrop.c +@@ -933,10 +933,17 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + + g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), NULL); + +- if(backdrop->priv->show_image && backdrop->priv->image_path) +- gdk_pixbuf_get_file_info(backdrop->priv->image_path, &iw, &ih); +- ++ if(backdrop->priv->show_image && backdrop->priv->image_path) { ++ image = gdk_pixbuf_new_from_file(backdrop->priv->image_path, NULL); ++ if(image) { ++ iw = gdk_pixbuf_get_width(image); ++ ih = gdk_pixbuf_get_height(image); ++ } ++ } ++ + if(backdrop->priv->width == 0 || backdrop->priv->height == 0) { ++ if(!image) ++ return NULL; + w = iw; + h = ih; + } else { +@@ -956,9 +963,7 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + final_image = create_solid(&backdrop->priv->color1, w, h, FALSE, 0xff); + } + +- /*check if the file exists, +- *and if it doesn't then make the background the single colour*/ +- if(!g_file_test(backdrop->priv->image_path, G_FILE_TEST_EXISTS)) { ++ if(!image) { + if(backdrop->priv->brightness != 0) + final_image = adjust_brightness(final_image, backdrop->priv->brightness); + +@@ -996,7 +1001,6 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + + switch(istyle) { + case XFCE_BACKDROP_IMAGE_CENTERED: +- image = gdk_pixbuf_new_from_file(backdrop->priv->image_path, NULL); + dx = MAX((w - iw) / 2, 0); + dy = MAX((h - ih) / 2, 0); + xo = MIN((w - iw) / 2, dx); +@@ -1007,7 +1011,6 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + break; + + case XFCE_BACKDROP_IMAGE_TILED: +- image = gdk_pixbuf_new_from_file(backdrop->priv->image_path, NULL); + tmp = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h); + for(i = 0; (i * iw) < w; i++) { + for(j = 0; (j * ih) < h; j++) { +@@ -1030,10 +1033,10 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + break; + + case XFCE_BACKDROP_IMAGE_STRETCHED: +- image = gdk_pixbuf_new_from_file_at_scale( +- backdrop->priv->image_path, w, h, FALSE, NULL); ++ xscale = (gdouble)w / iw; ++ yscale = (gdouble)h / ih; + gdk_pixbuf_composite(image, final_image, 0, 0, w, h, +- 0, 0, 1, 1, interp, 255); ++ 0, 0, xscale, yscale, interp, 255); + break; + + case XFCE_BACKDROP_IMAGE_SCALED: +@@ -1050,12 +1053,9 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + } + dx = xo; + dy = yo; +- +- image = gdk_pixbuf_new_from_file_at_scale( +- backdrop->priv->image_path, iw * xscale, +- ih * yscale, TRUE, NULL); ++ + gdk_pixbuf_composite(image, final_image, dx, dy, +- iw * xscale, ih * yscale, xo, yo, 1, 1, ++ iw * xscale, ih * yscale, xo, yo, xscale, yscale, + interp, 255); + break; + +@@ -1071,12 +1071,8 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) + xo = 0; + yo = (h - (ih * yscale)) * 0.5; + } +- +- image = gdk_pixbuf_new_from_file_at_scale( +- backdrop->priv->image_path, iw * xscale, +- ih * yscale, TRUE, NULL); + gdk_pixbuf_composite(image, final_image, 0, 0, +- w, h, xo, yo, 1, 1, interp, 255); ++ w, h, xo, yo, xscale, yscale, interp, 255); + break; + + default: +-- +1.8.1.5 + |