From 7a65a910b77ad191d69881098c47f9b0c852d92e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Aug 2013 01:33:19 -0700 Subject: Tue Aug 13 01:31:08 PDT 2013 --- community/flobopuyo/PKGBUILD | 46 +++++++++ community/flobopuyo/flobopuyo-0.20-gcc4.patch | 25 +++++ community/flobopuyo/flobopuyo-0.20-libs.patch | 136 ++++++++++++++++++++++++++ community/flobopuyo/flobopuyo-makefile.patch | 21 ++++ community/flobopuyo/flobopuyo.changelog | 16 +++ community/flobopuyo/flobopuyo.desktop | 10 ++ community/flobopuyo/flobopuyo.png | Bin 0 -> 2564 bytes 7 files changed, 254 insertions(+) create mode 100644 community/flobopuyo/PKGBUILD create mode 100644 community/flobopuyo/flobopuyo-0.20-gcc4.patch create mode 100644 community/flobopuyo/flobopuyo-0.20-libs.patch create mode 100644 community/flobopuyo/flobopuyo-makefile.patch create mode 100644 community/flobopuyo/flobopuyo.changelog create mode 100644 community/flobopuyo/flobopuyo.desktop create mode 100644 community/flobopuyo/flobopuyo.png (limited to 'community/flobopuyo') diff --git a/community/flobopuyo/PKGBUILD b/community/flobopuyo/PKGBUILD new file mode 100644 index 000000000..4531d93f9 --- /dev/null +++ b/community/flobopuyo/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 67617 2012-03-13 14:21:37Z lcarlier $ +# Maintainer : Jaroslav Lichtblau +# Contributor: Angelo Theodorou +# contributor: Laurent Carlier + +pkgname=flobopuyo +pkgver=0.20 +pkgrel=6 +pkgdesc="Clone of the famous PuyoPuyo" +arch=('i686' 'x86_64') +url="http://freshmeat.net/projects/$pkgname/" +license=('GPL') +depends=('libgl' 'sdl_image' 'sdl_mixer') +makedepends=('mesa' 'patch') +changelog=$pkgname.changelog +source=(http://www.sourcefiles.org/Games/Puzzle/$pkgname-$pkgver.tgz \ + $pkgname-makefile.patch $pkgname-0.20-gcc4.patch \ + $pkgname-0.20-libs.patch + $pkgname.desktop + $pkgname.png) +md5sums=('88961898c9dd48b60464f6f10f695b8b' + '4c6667be791681d43bb7ea1b6f9f9072' + 'bb8afd6e04bde08fd33e22c466674878' + 'b7c0fd71cd948bbc43a86742ffad6d86' + '20ebbe6e7ad57fe5f89a03ee40b4257e' + 'd9abe591e6cdd654269474444df1ec9d') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + patch -Np0 < ${srcdir}/$pkgname-makefile.patch + patch -Np1 < ${srcdir}/$pkgname-$pkgver-gcc4.patch + patch -Np1 < ${srcdir}/$pkgname-$pkgver-libs.patch + + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install + + install -D -m644 man/${pkgname}.6 ${pkgdir}/usr/share/man/man6/$pkgname.6 + install -D ${srcdir}/$pkgname.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop + install -D ${srcdir}/$pkgname.png ${pkgdir}/usr/share/pixmaps/$pkgname.png +} diff --git a/community/flobopuyo/flobopuyo-0.20-gcc4.patch b/community/flobopuyo/flobopuyo-0.20-gcc4.patch new file mode 100644 index 000000000..6c5d39445 --- /dev/null +++ b/community/flobopuyo/flobopuyo-0.20-gcc4.patch @@ -0,0 +1,25 @@ +Index: flobopuyo-0.20/IosVector.cpp +=================================================================== +--- flobopuyo-0.20.orig/IosVector.cpp ++++ flobopuyo-0.20/IosVector.cpp +@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize() + void IosVector::dumpVector() const { + fprintf(stderr, "Size: %d\n", getSize()); + for (int i = 0, j = getSize() ; i < j ; i++) +- fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i)); ++ fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i)); + fprintf(stderr, "\n"); + } +Index: flobopuyo-0.20/PuyoGame.cpp +=================================================================== +--- flobopuyo-0.20.orig/PuyoGame.cpp ++++ flobopuyo-0.20/PuyoGame.cpp +@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe + return (PuyoState)newItem; + } + else +- return (PuyoState)(int)(sequenceItems.getElementAt(sequence)); ++ return (PuyoState)(long)(sequenceItems.getElementAt(sequence)); + } + + PuyoPuyo::PuyoPuyo(PuyoState state) diff --git a/community/flobopuyo/flobopuyo-0.20-libs.patch b/community/flobopuyo/flobopuyo-0.20-libs.patch new file mode 100644 index 000000000..b6cca53cb --- /dev/null +++ b/community/flobopuyo/flobopuyo-0.20-libs.patch @@ -0,0 +1,136 @@ +--- flobopuyo-0.20/Makefile.orig 2004-10-08 18:41:12.000000000 -0400 ++++ flobopuyo-0.20/Makefile 2008-08-06 19:48:47.000000000 -0400 +@@ -41,15 +41,13 @@ + ############## + + SDL_CONFIG=sdl-config +-CC=g++ +-CXX=g++ + +-CFLAGS= -DDATADIR=\"${DATADIR}\" +-LDFLAGS= ++CXXFLAGS+= -DDATADIR=\"${DATADIR}\" + + ifneq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include +-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs` ++CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/usr/include ++LDFLAGS:=$(LDFLAGS) ++LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs` + endif + + HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\ +@@ -71,46 +69,46 @@ + ################ + # Mac OS X + ifeq ($(PLATFORM), Darwin) +-CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR ++CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR + endif + + ################ + # Win32 + ifeq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) +-LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain ++CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) ++LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) ++LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain + endif + + ifeq ($(ENABLE_AUDIO), true) +-CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1 ++CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1 + OBJFILES:=$(OBJFILES) + endif + + ifeq ($(ENABLE_OPENGL), true) +-CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1 ++CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1 + OBJFILES:=$(OBJFILES) glSDL.o + ifeq ($(PLATFORM), Linux) +-LDFLAGS:=$(LDFLAGS) -lGL ++LDFLAGS:=$(LDFLAGS) ++LIBS:=$(LIBS) -lGL + endif + endif + + ifeq ($(ENABLE_DGA), true) + ifeq ($(PLATFORM), Linux) +-CFLAGS:=$(CFLAGS) -DUSE_DGA=1 ++CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1 + endif + endif + + ifeq ($(DEBUG), true) +-CFLAGS:=$(CFLAGS) -DDEBUG=1 -g ++CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g + LDFLAGS:=$(LDFLAGS) -g + endif + +-CXXFLAGS=${CFLAGS} +- + all: prelude flobopuyo + + flobopuyo: ${OBJFILES} +- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES} ++ @echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image + @echo "--------------------------------------" + @echo " Compilation finished" + @[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true +@@ -121,14 +119,14 @@ + prelude: + @rm -f WARNINGS + @touch WARNINGS +- @echo "Compiling with CFLAGS=$(CFLAGS)" ++ @echo "Compiling with CXXFLAGS=$(CXXFLAGS)" + @echo "Compiling with LDFLAGS=$(LDFLAGS)" + + %.o:%.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + + %.o:%.cpp +- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + + PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES} + HiScores.o:HiScores.cpp HiScores.h preferences.h +@@ -155,10 +153,10 @@ + IosException.o:IosException.cpp + IosVector.o:IosVector.cpp + glSDL.o:glSDL.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS + SDL_prim.o:SDL_prim.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ @echo "[$@]" && $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS + corona.o:corona.cpp + corona32.o:corona32.cpp +@@ -178,7 +176,6 @@ + rm -f .DS_Store */.DS_Store */*/.DS_Store .gdb_history + + install: flobopuyo +- strip flobopuyo + mkdir -p ${INSTALL_BINDIR} + mkdir -p ${INSTALL_DATADIR} + cp -r data/* ${INSTALL_DATADIR} +@@ -191,7 +188,7 @@ + chmod a+rx ${INSTALL_BINDIR}/flobopuyo + + flobopuyo-static: prelude ${OBJFILES} +- @echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\ ++ @echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static ${OBJFILES}\ + /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs` + @echo "--------------------------------------" + @echo " Compilation finished" +@@ -207,7 +204,6 @@ + rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS + rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics + rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store +- strip $(bundle_name)/Contents/MacOS/flobopuyo + + mac-package: bundle + mkdir -p $(macimage_name) diff --git a/community/flobopuyo/flobopuyo-makefile.patch b/community/flobopuyo/flobopuyo-makefile.patch new file mode 100644 index 000000000..e0ec22052 --- /dev/null +++ b/community/flobopuyo/flobopuyo-makefile.patch @@ -0,0 +1,21 @@ +--- Makefile 2004-10-09 01:41:12.000000000 +0300 ++++ Makefile 2005-03-04 05:51:21.000000000 +0200 +@@ -6,15 +6,15 @@ + # Settings + + ENABLE_AUDIO=true +-ENABLE_OPENGL=false ++ENABLE_OPENGL=true + ENABLE_DGA=false + + DEBUG_MODE=false + + # Unix/Linux settings +-PREFIX=/usr/local ++PREFIX=/usr + DATADIR=$(PREFIX)/share/games/flobopuyo +-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games ++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin + INSTALL_DATADIR=$(DESTDIR)/$(DATADIR) + + # Mac settings diff --git a/community/flobopuyo/flobopuyo.changelog b/community/flobopuyo/flobopuyo.changelog new file mode 100644 index 000000000..eee8fbb12 --- /dev/null +++ b/community/flobopuyo/flobopuyo.changelog @@ -0,0 +1,16 @@ +2010-11-24 Jaroslav Lichtblau + * flobopuyo 0.20-5 + * home page and source file fix + +2010-07-13 Laurent Carlier + * Rebuild for i686 and x86_64 + * Add .desktop file and icon + +2008-09-15 Ronald van Haren + * added x86_64 version & a couple of patches to build it + +2008-09-14 Jaroslav Lichtblau + * Added provided man page to the package + +2008-09-11 Jaroslav Lichtblau + * Package moved to [community] diff --git a/community/flobopuyo/flobopuyo.desktop b/community/flobopuyo/flobopuyo.desktop new file mode 100644 index 000000000..aae37c31e --- /dev/null +++ b/community/flobopuyo/flobopuyo.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Flobopuyo +Comment=A remake of the famous PuyoPuyo +Exec=flobopuyo +Icon=/usr/share/pixmaps/flobopuyo.png +Terminal=false +Type=Application +Categories=Application;Game;ArcadeGame; +StartupNotify=false diff --git a/community/flobopuyo/flobopuyo.png b/community/flobopuyo/flobopuyo.png new file mode 100644 index 000000000..5d52fedf7 Binary files /dev/null and b/community/flobopuyo/flobopuyo.png differ -- cgit v1.2.3-54-g00ecf