4 files changed, 26 insertions, 36 deletions
diff --git a/games/nestopia/CMakeLists.txt.patch b/games/nestopia/CMakeLists.txt.patch
deleted file mode 100644
index 66ba330ec0..0000000000
--- a/games/nestopia/CMakeLists.txt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2017-12-16 19:36:37.881668295 -0800
-+++ CMakeLists.txt	2017-12-16 19:36:51.612529617 -0800
-@@ -424,7 +424,7 @@
- install( FILES source/unix/icons/svg/nespad.svg    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps )
- 
- # documentation
--install( FILES AUTHORS ChangeLog README.md README.unix DESTINATION ${CMAKE_INSTALL_DOCDIR} )
-+install( FILES AUTHORS ChangeLog README.md DESTINATION ${CMAKE_INSTALL_DOCDIR} )
- install( FILES readme.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/html )
- 
- option( ENABLE_DOC "Install full documentation suite" )
diff --git a/games/nestopia/nestopia.SlackBuild b/games/nestopia/nestopia.SlackBuild
index 97acd4c796..6c681f22c7 100644
--- a/games/nestopia/nestopia.SlackBuild
+++ b/games/nestopia/nestopia.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=nestopia
 LIBNAM=${PRGNAM}_libretro
-VERSION=${VERSION:-1.48}
+VERSION=${VERSION:-1.49}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
@@ -54,19 +54,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch --verbose < $CWD/CMakeLists.txt.patch
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release .. \
-    -DENABLE_DOC=ON
-  make
-  make install DESTDIR=$PKG
-cd ..
+autoreconf -vif
+
+# --enable-gui requires a newer GTK than what's in 14.2.
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --enable-doc \
+  # --enable-gui
+
+make
+make install DESTDIR=$PKG
 
 make -C libretro
 
@@ -75,10 +80,6 @@ install -Dm0644 libretro/$LIBNAM.so \
 install -Dm0644 $CWD/$LIBNAM.info \
   $PKG/usr/lib${LIBDIRSUFFIX}/libretro/info/$LIBNAM.info
 
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-rmdir $PKG/usr/share/doc
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/games/nestopia/nestopia.info b/games/nestopia/nestopia.info
index ad2ed636a2..9319b50390 100644
--- a/games/nestopia/nestopia.info
+++ b/games/nestopia/nestopia.info
@@ -1,12 +1,12 @@
 PRGNAM="nestopia"
-VERSION="1.48"
+VERSION="1.49"
 HOMEPAGE="http://0ldsk00l.ca/nestopia/"
-DOWNLOAD="http://downloads.sourceforge.net/project/nestopiaue/1.48/nestopia-1.48.tgz \
-          https://raw.githubusercontent.com/libretro/libretro-super/392247c/dist/info/nestopia_libretro.info"
-MD5SUM="028172125a16625f51d470293babacb2 \
-        167b9a50a7e6eb0b272bec7e9dd6cc6b"
+DOWNLOAD="http://downloads.sourceforge.net/project/nestopiaue/1.49/nestopia-1.49.tgz \
+          https://raw.githubusercontent.com/libretro/libretro-super/6043e5f/dist/info/nestopia_libretro.info"
+MD5SUM="249910d2d7a3bc3d978ce3d0b6d6304e \
+        1813bb09acf63d4772e50adc4182d259"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2"
+REQUIRES="SDL2 autoconf-archive"
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"
diff --git a/games/nestopia/slack-desc b/games/nestopia/slack-desc
index d586b4be77..3fd8c07cff 100644
--- a/games/nestopia/slack-desc
+++ b/games/nestopia/slack-desc
@@ -13,7 +13,7 @@ nestopia: It strives for the most accurate emulation possible at the pixel-by-
 nestopia: pixel and sample-by-sample level. It was also one of the inspirations
 nestopia: for bsnes.
 nestopia:
-nestopia: http://0ldsk00l.ca/nestopia.html
+nestopia: http://0ldsk00l.ca/nestopia/
 nestopia:
 nestopia:
 nestopia: