summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrimi2016-04-09 08:26:19 +0200
committergrimi2016-04-09 08:26:19 +0200
commit82f745c6d30482bfbef36aa58874e102fee8939d (patch)
tree5061a1fa4ce0979435c6d2c64c715ee9c213969f
parent34aa0c801ca5e7f2d6c2cd0ad60d378cf1e4d715 (diff)
downloadaur-82f745c6d30482bfbef36aa58874e102fee8939d.tar.gz
Upstream: 2.7.11dev
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD61
2 files changed, 8 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c7b884a113..1c558e6322e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Apr 8 21:52:01 UTC 2016
+# Sat Apr 9 06:26:19 UTC 2016
pkgbase = fs-uae-devel
pkgdesc = Cross-platform Amiga emulator based on UAE/WinUAE (development version).
- pkgver = 2.7.10dev
+ pkgver = 2.7.11dev
pkgrel = 1
url = http://fs-uae.net/download-devel
install = fs-uae-devel.install
@@ -23,8 +23,8 @@ pkgbase = fs-uae-devel
depends = shared-mime-info
provides = fs-uae
conflicts = fs-uae
- source = http://fs-uae.net/devel/2.7.10dev/fs-uae-2.7.10dev.tar.gz
- md5sums = cc214923583464d416b4cdd2c8808f44
+ source = http://fs-uae.net/devel/2.7.11dev/fs-uae-2.7.11dev.tar.gz
+ md5sums = ba237e87bf3f11b2adf76381429e4dd9
pkgname = fs-uae-devel
diff --git a/PKGBUILD b/PKGBUILD
index 70d651d1a8c..2a49726dfb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=fs-uae
pkgname=fs-uae-devel
-pkgver=2.7.10dev
+pkgver=2.7.11dev
pkgrel=1
pkgdesc="Cross-platform Amiga emulator based on UAE/WinUAE (development version)."
arch=("i686" "x86_64")
@@ -16,63 +16,17 @@ source=("http://fs-uae.net/devel/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
#source=("http://ppa.launchpad.net/fengestad/devel/ubuntu/pool/main/f/${_pkgname}/${_pkgname}_${pkgver}.orig.tar.gz")
provides=("fs-uae")
conflicts=("fs-uae")
-md5sums=('cc214923583464d416b4cdd2c8808f44')
+md5sums=('ba237e87bf3f11b2adf76381429e4dd9')
#MAKEFLAGS="-j1"
-
-## alternative build method for 64bit platform ##
-## (with multilib enabled) ##
-## comment variable to build 64bit version ##
-## 0 = build 32bit version ##
-## 1 and 2 = dual 32/64 bit ##
-## 1 = default 32bit exe ##
-## 2 = default 64bit exe ##
-#FSUAE3264=2
-
-
-
-if [[ -n $FSUAE3264 && $CARCH == "x86_64" && -n $(gcc -v 2>&1|grep '\-\-enable-multilib') ]]; then
- if [[ $FSUAE3264 == [1-2] ]]; then
- depends+=("lib32-sdl2" "lib32-libpng" "lib32-glib2" "lib32-openal" "lib32-mesa" "lib32-glew" "lib32-libmpeg2" "lib32-gettext" "lib32-freetype2")
- pkgdesc="${pkgdesc/(dev/dual 64 and 32-bit dev}"
- elif [[ $FSUAE3264 == 0 ]]; then
- depends=("lib32-sdl2" "lib32-libpng" "lib32-glib2" "lib32-openal" "lib32-mesa" "lib32-glew" "lib32-libmpeg2" "lib32-gettext" "lib32-freetype2"
- "hicolor-icon-theme" "xdg-utils" "shared-mime-info")
- pkgdesc="${pkgdesc/(dev/(32-bit dev}"
- fi
-else
- unset FSUAE3264
-fi
-
-
-
build() {
cd ${_pkgname}-${pkgver}
- if [[ $FSUAE3264 != 0 ]]; then
- ./configure --prefix=/usr
- make
- fi
-
- if [[ $FSUAE3264 == [1-2] ]]; then
- cp fs-uae ../fs-uae-64
- cp fs-uae-device-helper ../
- make clean
- fi
-
- if [[ $FSUAE3264 == [0-2] ]]; then
- export CC="gcc -m32" CXX="g++ -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- export CFLAGS="${CFLAGS/x86-64/i686}" CXXFLAGS="${CXXFLAGS/x86-64/i686}"
- ./configure --prefix=/usr
- make
- fi
-
- if [[ $FSUAE3264 == [1-2] ]]; then
- echo -e "#!/bin/sh\n[[ -z \$FSUAE_EXE ]] && FSUAE_EXE=$(($FSUAE3264*32))\nexec /usr/bin/fs-uae-\${FSUAE_EXE} \"\$@\"" > fs-uae.sh
- fi
+ ./configure --prefix=/usr
+ make
}
@@ -81,13 +35,6 @@ package() {
cd ${_pkgname}-${pkgver}
make install DESTDIR="${pkgdir}"
-
- if [[ $FSUAE3264 == [1-2] ]]; then
- mv "${pkgdir}"/usr/bin/fs-uae{,-32}
- install -m755 ../fs-uae-64 "${pkgdir}"/usr/bin
- install -m755 ../fs-uae-device-helper "${pkgdir}"/usr/bin
- install -m755 fs-uae.sh "${pkgdir}"/usr/bin/fs-uae
- fi
}