From eaf7f4d9be4a34e87b1b06f821a64f345098ea2e Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Wed, 25 Aug 2010 20:47:23 -0400 Subject: games/bsnes: Updated for version 0.068. Signed-off-by: dsomero --- games/bsnes/bsnes-0.064-makefile.patch | 126 -------------------------------- games/bsnes/bsnes-0.068-makefile.patch | 127 +++++++++++++++++++++++++++++++++ games/bsnes/bsnes.SlackBuild | 11 +-- games/bsnes/bsnes.info | 8 +-- games/bsnes/slack-desc | 4 +- 5 files changed, 139 insertions(+), 137 deletions(-) delete mode 100644 games/bsnes/bsnes-0.064-makefile.patch create mode 100644 games/bsnes/bsnes-0.068-makefile.patch (limited to 'games') diff --git a/games/bsnes/bsnes-0.064-makefile.patch b/games/bsnes/bsnes-0.064-makefile.patch deleted file mode 100644 index 754dfe23dd65a..0000000000000 --- a/games/bsnes/bsnes-0.064-makefile.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/snesfilter/Makefile b/snesfilter/Makefile -index 089b86e..08ba81b 100755 ---- a/../snesfilter/Makefile -+++ b/../snesfilter/Makefile -@@ -5,12 +5,12 @@ include nall/qt/Makefile - - c := $(compiler) -std=gnu99 - cpp := $(subst cc,++,$(compiler)) -std=gnu++0x --flags := -O3 -I. -Iobj -fomit-frame-pointer $(qtinc) -+flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer $(qtinc) - link := - - ifeq ($(platform),x) - flags := -fPIC -fopenmp $(flags) -- link += -s -fopenmp -lpthread -lgomp -+ link += -fopenmp -lpthread -lgomp - else ifeq ($(platform),osx) - flags := -fPIC -fopenmp $(flags) - link += -fopenmp -lpthread -lgomp -@@ -73,9 +73,8 @@ endif - - install: - ifeq ($(platform),x) -- install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib -- install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib -- ldconfig -n $(DESTDIR)$(prefix)/lib -+ install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib/libsnesfilter.a -+ install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib/libsnesfilter.so - else ifeq ($(platform),osx) - cp libsnesfilter.dylib /usr/local/lib/libsnesfilter.dylib - endif -diff --git a/snesreader/Makefile b/snesreader/Makefile -index 761317b..868a0cc 100755 ---- a/../snesreader/Makefile -+++ b/../snesreader/Makefile -@@ -5,12 +5,11 @@ include nall/qt/Makefile - - c := $(compiler) -std=gnu99 - cpp := $(subst cc,++,$(compiler)) -std=gnu++0x --flags := -O3 -I. -Iobj -fomit-frame-pointer -+flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer - link := - - ifeq ($(platform),x) - flags := -fPIC $(flags) -- link += -s - else ifeq ($(platform),osx) - flags := -fPIC $(flags) - endif -@@ -171,9 +170,8 @@ endif - - install: - ifeq ($(platform),x) -- install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib -- install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib -- ldconfig -n $(DESTDIR)$(prefix)/lib -+ install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib/libsnesreader.a -+ install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib/libsnesreader.so - else ifeq ($(platform),osx) - cp libsnesreader.dylib /usr/local/lib/libsnesreader.dylib - endif -diff --git a/src/Makefile b/src/Makefile -index c3c1fe9..4b5de6d 100755 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ ui := ui_qt - # compiler - c := $(compiler) -std=gnu99 - cpp := $(subst cc,++,$(compiler)) -std=gnu++0x --flags := -O3 -fomit-frame-pointer -I. -+flags := $(CXXFLAGS) -fomit-frame-pointer -I. - link := - objects := - -@@ -17,7 +17,7 @@ objects := - - # platform - ifeq ($(platform),x) -- link += -s -ldl -lX11 -lXext -+ link += -ldl -lX11 -lXext - else ifeq ($(platform),osx) - else ifeq ($(platform),win) - link += -mwindows -mthreads -@@ -60,8 +60,8 @@ endif - install: - ifeq ($(platform),x) - install -D -m 755 ../bsnes $(DESTDIR)$(prefix)/bin/bsnes -- install -D -m 644 data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png -- install -D -m 644 data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop -+ install -D -m 644 data/bsnes.png $(DESTDIR)/usr/share/pixmaps/bsnes.png -+ install -D -m 644 data/bsnes.desktop $(DESTDIR)/usr/share/applications/bsnes.desktop - endif - - uninstall: -diff --git a/supergameboy/Makefile b/supergameboy/Makefile -index 60409af..cbef9ac 100755 ---- a/../supergameboy/Makefile -+++ b/../supergameboy/Makefile -@@ -2,14 +2,13 @@ include nall/Makefile - - c := $(compiler) -std=gnu99 - cpp := $(subst cc,++,$(compiler)) -std=gnu++0x --flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src -+flags := $(CXXFLAGS) -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src - link := - - ifeq ($(platform),osx) - flags := -fPIC $(flags) - else ifeq ($(platform),x) - flags := -fPIC $(flags) -- link += -s - endif - - objects := supergameboy -@@ -113,9 +112,8 @@ install: - ifeq ($(platform),osx) - cp libsupergameboy.dylib /usr/local/lib/libsupergameboy.dylib - else -- install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib -- install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib -- ldconfig -n $(DESTDIR)$(prefix)/lib -+ install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib/libsupergameboy.a -+ install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib/libsupergameboy.so - endif - - clean: diff --git a/games/bsnes/bsnes-0.068-makefile.patch b/games/bsnes/bsnes-0.068-makefile.patch new file mode 100644 index 0000000000000..18399a7546e26 --- /dev/null +++ b/games/bsnes/bsnes-0.068-makefile.patch @@ -0,0 +1,127 @@ +diff --git a/snesfilter/Makefile b/snesfilter/Makefile +index 089b86e..08ba81b 100755 +--- a/../snesfilter/Makefile ++++ b/../snesfilter/Makefile +@@ -5,12 +5,12 @@ include nall/qt/Makefile + + c := $(compiler) -std=gnu99 + cpp := $(subst cc,++,$(compiler)) -std=gnu++0x +-flags := -O3 -I. -Iobj -fomit-frame-pointer $(qtinc) ++flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer $(qtinc) + link := + + ifeq ($(platform),x) + flags := -fPIC -fopenmp $(flags) +- link += -s -fopenmp -lpthread -lgomp ++ link += -fopenmp -lpthread -lgomp + else ifeq ($(platform),osx) + flags := -fPIC -fopenmp $(flags) + link += -fopenmp -lpthread -lgomp +@@ -73,9 +73,8 @@ endif + + install: + ifeq ($(platform),x) +- install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib +- install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib +- ldconfig -n $(DESTDIR)$(prefix)/lib ++ install -D -m 755 libsnesfilter.a $(DESTDIR)$(prefix)/lib/libsnesfilter.a ++ install -D -m 755 libsnesfilter.so $(DESTDIR)$(prefix)/lib/libsnesfilter.so + else ifeq ($(platform),osx) + cp libsnesfilter.dylib /usr/local/lib/libsnesfilter.dylib + endif +diff --git a/snesreader/Makefile b/snesreader/Makefile +index 761317b..868a0cc 100755 +--- a/../snesreader/Makefile ++++ b/../snesreader/Makefile +@@ -5,12 +5,11 @@ include nall/qt/Makefile + + c := $(compiler) -std=gnu99 + cpp := $(subst cc,++,$(compiler)) -std=gnu++0x +-flags := -O3 -I. -Iobj -fomit-frame-pointer ++flags := $(CXXFLAGS) -I. -Iobj -fomit-frame-pointer + link := + + ifeq ($(platform),x) + flags := -fPIC $(flags) +- link += -s + else ifeq ($(platform),osx) + flags := -fPIC $(flags) + endif +@@ -171,9 +170,8 @@ endif + + install: + ifeq ($(platform),x) +- install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib +- install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib +- ldconfig -n $(DESTDIR)$(prefix)/lib ++ install -D -m 755 libsnesreader.a $(DESTDIR)$(prefix)/lib/libsnesreader.a ++ install -D -m 755 libsnesreader.so $(DESTDIR)$(prefix)/lib/libsnesreader.so + else ifeq ($(platform),osx) + cp libsnesreader.dylib /usr/local/lib/libsnesreader.dylib + endif +diff --git a/src/Makefile b/src/Makefile +index c3c1fe9..4b5de6d 100755 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ ui := qt + # compiler + c := $(compiler) -std=gnu99 + cpp := $(subst cc,++,$(compiler)) -std=gnu++0x +-flags := -O3 -fomit-frame-pointer -I. -I$(snes) ++flags := $(CXXFLAGS) -fomit-frame-pointer -I. -I$(snes) + link := + objects := + +@@ -17,7 +17,7 @@ objects := + + # platform + ifeq ($(platform),x) +- link += -s -ldl -lX11 -lXext ++ link += -ldl -lX11 -lXext + else ifeq ($(platform),osx) + else ifeq ($(platform),win) + link += -mwindows -mthreads +@@ -60,8 +60,8 @@ endif + install: + ifeq ($(platform),x) +- install -D -m 755 out/bsnes-$(profile) $(DESTDIR)$(prefix)/bin/bsnes-$(profile) +- install -D -m 644 qt/data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png +- install -D -m 644 qt/data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop ++ install -D -m 755 out/bsnes-$(profile) $(DESTDIR)$(prefix)/bin/bsnes ++ install -D -m 644 qt/data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png ++ install -D -m 644 qt/data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop + endif + + uninstall: +diff --git a/supergameboy/Makefile b/supergameboy/Makefile +index 60409af..cbef9ac 100755 +--- a/../supergameboy/Makefile ++++ b/../supergameboy/Makefile +@@ -2,14 +2,13 @@ include nall/Makefile + + c := $(compiler) -std=gnu99 + cpp := $(subst cc,++,$(compiler)) -std=gnu++0x +-flags := -O3 -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src ++flags := $(CXXFLAGS) -fomit-frame-pointer -I. -Icommon -Ilibgambatte/include -Ilibgambatte/src + link := + + ifeq ($(platform),osx) + flags := -fPIC $(flags) + else ifeq ($(platform),x) + flags := -fPIC $(flags) +- link += -s + endif + + objects := supergameboy +@@ -113,9 +112,8 @@ install: + ifeq ($(platform),osx) + cp libsupergameboy.dylib /usr/local/lib/libsupergameboy.dylib + else +- install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib +- install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib +- ldconfig -n $(DESTDIR)$(prefix)/lib ++ install -D -m 755 libsupergameboy.a $(DESTDIR)$(prefix)/lib/libsupergameboy.a ++ install -D -m 755 libsupergameboy.so $(DESTDIR)$(prefix)/lib/libsupergameboy.so + endif + + clean: diff --git a/games/bsnes/bsnes.SlackBuild b/games/bsnes/bsnes.SlackBuild index 69fc13d99ccc9..db126d5e861ea 100644 --- a/games/bsnes/bsnes.SlackBuild +++ b/games/bsnes/bsnes.SlackBuild @@ -5,7 +5,7 @@ # Written by Larry Hajali PRGNAM=bsnes -VERSION=${VERSION:-0.067} +VERSION=${VERSION:-0.068} SRCVER=${VERSION:2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,6 +46,7 @@ rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION tar xvf $CWD/${PRGNAM}_v${SRCVER}.tar.bz2 +find . -type d -exec chmod -R 0755 {} \; chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -53,10 +54,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -cd src +cd $PRGNAM # Patch makefile so SLKCFLAGS and LIBDIRSUFFIX are recognized. -cat $CWD/bsnes-0.064-makefile.patch \ +cat $CWD/bsnes-0.068-makefile.patch \ | sed -e "/^\+/s|/lib/|/lib${LIBDIRSUFFIX}/|g" \ | patch -p1 @@ -65,7 +66,7 @@ cat $CWD/bsnes-0.064-makefile.patch \ sed -i \ -e 's|audio.pulseaudio ||' \ -e 's|audio.pulseaudiosimple ||' \ - -e '/pulse/d' ui_qt/Makefile + -e '/pulse/d' qt/Makefile CXXFLAGS="$SLKCFLAGS" \ make \ @@ -92,7 +93,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a data/*.html $PKG/usr/doc/$PRGNAM-$VERSION +cp -a qt/data/*.html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -type f -exec chmod 0644 {} \; diff --git a/games/bsnes/bsnes.info b/games/bsnes/bsnes.info index 2be94825dde57..ce29e2e091d4b 100644 --- a/games/bsnes/bsnes.info +++ b/games/bsnes/bsnes.info @@ -1,10 +1,10 @@ PRGNAM="bsnes" -VERSION="0.067" +VERSION="0.068" HOMEPAGE="http://byuu.org/bsnes/" -DOWNLOAD="http://bsnes.googlecode.com/files/bsnes_v067.tar.bz2" -MD5SUM="c0cc823fe0b15a892af9e6d864214e29" +DOWNLOAD="http://bsnes.googlecode.com/files/bsnes_v068.tar.bz2" +MD5SUM="9ff2f6dc64f54f0da538cefade64b3a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" -APPROVED="Erik Hanson" +APPROVED="dsomero" diff --git a/games/bsnes/slack-desc b/games/bsnes/slack-desc index de8921d17b9f0..93af4388c30a3 100644 --- a/games/bsnes/slack-desc +++ b/games/bsnes/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| bsnes: bsnes (SNES Emulator) -bsnes: +bsnes: bsnes: bsnes is an emulator that began development on 2004-10-14. The purpose bsnes: of this emulator is a bit different from others: it focuses on bsnes: accuracy, debugging functionality, and clean code. The emulator does bsnes: not focus on things that would hinder accuracy. This includes speed bsnes: and game-specific hacks for compatibility. As a result, the minimum bsnes: system requirements for bsnes are very high. -bsnes: +bsnes: bsnes: Homepage: http://byuu.org/bsnes/ bsnes: -- cgit v1.2.3