metapackage

3 files changed, 15 insertions, 154 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d97c67a85ee..8b5fc41c3903 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,8 @@
 pkgbase = dolphin-emu-faster-melee
-	pkgdesc = The FasterMelee NetPlay build of the Dolphin Emulator
-	pkgver = 5.9
+	pkgdesc = metapackage - migrate to dolphin-emu
+	pkgver = 0.0.1
 	pkgrel = 1
-	url = http://fastermelee.net
-	arch = x86_64
-	license = GPL
-	makedepends = cmake
-	makedepends = wget
-	depends = bluez-libs
-	depends = curl
-	depends = enet
-	depends = ffmpeg
-	depends = glu
-	depends = libao
-	depends = libevdev
-	depends = libsystemd
-	depends = libusb
-	depends = libxext
-	depends = mbedtls
-	depends = mesa
-	depends = miniupnpc
-	depends = openal
-	depends = portaudio
-	depends = soundtouch
-	depends = xdg-utils
-	depends = wxgtk3
-	optdepends = pulseaudio: PulseAudio backend
-	options = !emptydirs
-	source = https://github.com/FasterMelee/Ishiiruka/archive/4ecca10c2dc2f4cd33c5cfaed3cbb5a63142a709.tar.gz
-	source = https://github.com/FasterMelee/FasterMelee-installer/raw/master/config/5.9-fmconfig.tar.gz
-	sha256sums = f1ed6e2e1b89ae69a8bc722a4f92ca0eb5c399b8af7e86bc147bb52bf588194c
-	sha256sums = f1eb3e73197f4ab9ed63a17b107f37e33191286f44696fa91de9d189760b5ecb
+	epoch = 1
+	arch = any
 
 pkgname = dolphin-emu-faster-melee
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 71e49d1db9d8..bc9d55b0b1b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,126 +1,11 @@
-# Maintainer: c-er
-# Previously flurb <aidand(at)princeton(dot)edu>
-# Previously pyamsoft <pyam(dot)soft(at)gmail(dot)com>
-
-# This build can be installed alongside dolphin-emu
-# Run using dolphin-emu-faster-melee
-# Make sure to set CPUS_DESIRED for faster compilation
-
-# Uses a modified version of https://github.com/FasterMelee/FasterMelee-installer (thank you!)
-
+_newpkg='dolphin-emu'
 pkgname=dolphin-emu-faster-melee
-pkgver=5.9
+pkgver=0.0.1
 pkgrel=1
-pkgdesc='The FasterMelee NetPlay build of the Dolphin Emulator'
-arch=('x86_64')
-url='http://fastermelee.net'
-license=('GPL')
-makedepends=('cmake' 'wget')
-depends=('bluez-libs' 'curl' 'enet' 'ffmpeg' 'glu' 'libao' 'libevdev' 'libsystemd' 'libusb' 'libxext' 'mbedtls' 'mesa' 'miniupnpc' 'openal' 'portaudio' 'soundtouch' 'xdg-utils' 'wxgtk3')
-optdepends=('pulseaudio: PulseAudio backend')
-options=('!emptydirs')
-
-COMMITHASH="4ecca10c2dc2f4cd33c5cfaed3cbb5a63142a709"
-
-source=("https://github.com/FasterMelee/Ishiiruka/archive/$COMMITHASH.tar.gz"
-	"https://github.com/FasterMelee/FasterMelee-installer/raw/master/config/5.9-fmconfig.tar.gz")
-
-sha256sums=('f1ed6e2e1b89ae69a8bc722a4f92ca0eb5c399b8af7e86bc147bb52bf588194c'
-            'f1eb3e73197f4ab9ed63a17b107f37e33191286f44696fa91de9d189760b5ecb')
-
-CPUS_DESIRED=4
-
-prepare() {
-  cd "$srcdir"
-  
-  echo "Extracting..."
-  tar -xzf "$pkgver-fmconfig.tar.gz" && rm "$pkgver-fmconfig.tar.gz"	
-  echo "Extracting..."
-  tar -xzf "$COMMITHASH.tar.gz" && rm "$COMMITHASH.tar.gz"
-  mv "Ishiiruka-$COMMITHASH" Ishiiruka
-  cd Ishiiruka
-
-  # --- Temporary patch for updated glibc
-  echo "Patching xlocale.h requirement..."
-  sed -i "s|#define wxUSE_XLOCALE 1|#define wxUSE_XLOCALE 0|g" Externals/wxWidgets3/wx/wxcocoa.h
-  sed -i "s|#define wxUSE_XLOCALE 1|#define wxUSE_XLOCALE 0|g" Externals/wxWidgets3/wx/wxgtk.h
-  # ---
-
-  # --- Patch tarball to display correct hash to other netplay clients
-  echo "Patching tarball..."
-  sed -i "s|\${GIT_EXECUTABLE} rev-parse HEAD|echo $COMMITHASH|g" CMakeLists.txt
-  # --set scm_rev_str everywhere to actual commit hash when downloaded
-  sed -i "s|\${GIT_EXECUTABLE} describe --always --long --dirty|echo FM v$pkgver BETA|g" CMakeLists.txt
-  # ensures compatibility w/ netplay
-  sed -i "s|\${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD|echo HEAD|g" CMakeLists.txt
-  # ---
-
-
-  # --- Dirty patch for https://bugs.dolphin-emu.org/issues/11047
-  echo "Patching xgetbv function..."
-  sed -i "s|#include <cstring>|#include <cstring>\n#define _XSAVEINTRIN_H_INCLUDED|g" Source/Core/Common/x64CPUDetect.cpp # issue 1
-  # sed -i "s|check_and_add_flag(CXX17 -std=c++17)|#check_and_add_flag(CXX17 -std=c++17)" # issue 2 not present
-  # ---
-  
-  # --- move necessary config files into the build folder
-  echo "Adding FM config files..."
-  mkdir build && cd build
-  mv ../../Binaries .
-  mv ../Data/dolphin-emu.png Binaries/
-  # ---
-}
-
-build() {
- 
-  cd "$srcdir"
-  
-  if [ ! -d "$srcdir/bin" ]; then # ...then we need to compile !
-    # --- Attempts to determine the number of cores in the CPU. ---
-    # Source: https://gist.github.com/jj1bdx/5746298
-    # Linux and similar...
-    CPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
-    # FreeBSD and similar...
-    [ -z "$CPUS" ] && CPUS=$(getconf NPROCESSORS_ONLN)
-    # Solaris and similar...
-    [ -z "$CPUS" ] && CPUS=$(ksh93 -c 'getconf NPROCESSORS_ONLN')
-    # Give up...
-    [ -z "$CPUS" ] && CPUS=1
-
-    # --- for -j flag (# of cores utilized)
-
-    echo ""
-    echo "CPU Threads detected: $CPUS"
-    if [ "$CPUS_DESIRED" -ge 1 ] 2> /dev/null && [ "$CPUS_DESIRED" -le $((CPUS + 1)) ] 2> /dev/null; then
-	    CPUS=$CPUS_DESIRED 
-    else
-	    CPUS=1
-    fi
-    echo "Using $CPUS thread(s)!"
-    
-    # --- cmake and compile
-    cd Ishiiruka/build
-    echo "cmaking..."
-    cmake .. -DLINUX_LOCAL_DEV=true \
-             -DDISTRIBUTOR='aur.archlinux.org'
-    echo "Compiling..."
-    make -j $CPUS
-
-    echo "Cleaning up..."
-    cd ../..
-    mv Ishiiruka/build/Binaries bin/
-    rm -rf Ishiiruka
-  fi
-}
-
-package() {
-  cd "$srcdir"
-
-	echo 'SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="0337", MODE="0666"' > 51-gcadapter.rules
-  install -Dm 644 "${srcdir}"/51-gcadapter.rules -t "${pkgdir}"/usr/lib/udev/rules.d/
+epoch=1
+pkgdesc="metapackage - migrate to $_newpkg"
+arch=('any')
 
-  install -d "${pkgdir}"/usr/share/
-  cp -r "${srcdir}"/bin "${pkgdir}"/usr/share/dolphin-emu-faster-melee/
-  
-  echo "#!/bin/sh /usr/share/dolphin-emu-faster-melee/dolphin-emu \"\$@\"" > dolphin-emu-faster-melee
-  install -Dm 755 "${srcdir}"/dolphin-emu-faster-melee -t "${pkgdir}"/usr/bin/
+_package() {
+  depends=("$_newpkg")
 }