Upstream: 3.0

1 files changed, 10 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a4cb90c4607d..d17893cc217d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,39 +2,33 @@
 
 pkgname=vice-gtkglext
 _pkgname=vice
-pkgver=2.4
-pkgrel=4
+pkgver=3.0
+pkgrel=1
 pkgdesc="A Versatile Commodore Emulator , with enabled gtkglext"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://vice-emu.sourceforge.net"
-depends=('alsa-lib' 'gtkglext' 'giflib' 'libjpeg' 'libpng' 'libxrandr' 'vte' 'lame' 'libpcap' 'libnet')
+depends=('alsa-lib' 'gtkglext' 'giflib' 'libjpeg-turbo' 'libpng' 'libxrandr' 'vte' 'lame' 'libpcap' 'libnet')
 makedepends=('pkg-config')
 provides=("vice=$pkgver")
-conflicts=('vice' 'vice-gnomeui' 'vice-sdl' 'vice-ethernet')
+conflicts=('vice' 'vice-gtk' 'vice-sdl' 'vice-ethernet')
 replaces=('vice')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/project/vice-emu/releases/${_pkgname}-${pkgver}.tar.gz
-        vice-no-fc-cache.patch vice-notexi-notxt.patch vice-x11video.patch vice-2.4-giflib-5.1.0.patch)
-md5sums=('b017647a0c159bbe43cdb81762d1c577'
-         'c7ba8ff930bee0e41565f4a1d9594922'
-         '877f93db1550ea81386aae7c3b578442'
-         '99931efcb779734c9df069e94f0b38a5'
-         '94563e3023d804341f1d252c0e6d1384')
+source=(http://downloads.sourceforge.net/project/vice-emu/releases/${_pkgname}-${pkgver}.tar.gz no-fc-cache.patch)
+sha1sums=('424860f897b2dffd7162d133ee4a15e970491cd0'
+          '1eb7b3d0574d60f4e11edfc48566019451e94ccd')
 
 
 prepare() {
   cd ${_pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/vice-no-fc-cache.patch
-  patch -Np1 -i "${srcdir}"/vice-notexi-notxt.patch
-  patch -Np1 -i "${srcdir}"/vice-x11video.patch
-  patch -Np1 -i "${srcdir}"/vice-2.4-giflib-5.1.0.patch
+  patch -Np0 -i ../no-fc-cache.patch
 }
 
+
 build() {
   cd ${_pkgname}-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib --enable-gnomeui \
-     --enable-ethernet --disable-ffmpeg
+    --enable-ethernet
   make
 }