diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | trackballs.desktop | 9 | ||||
| -rw-r--r-- | trackballs.patch | 90 |
4 files changed, 18 insertions, 125 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Sun Jun 11 07:42:19 UTC 2017 pkgbase = trackballs pkgdesc = Simple game similar to the classical game Marble Madness on the Amiga in the 80's - pkgver = 1.1.4 - pkgrel = 7 + pkgver = 1.2.0 + pkgrel = 1 url = http://trackballs.sourceforge.net/ arch = i686 arch = x86_64 @@ -11,14 +13,8 @@ pkgbase = trackballs depends = sdl_image depends = sdl_mixer depends = mesa - source = http://downloads.sourceforge.net/sourceforge/trackballs/trackballs-1.1.4.tar.gz - source = http://downloads.sourceforge.net/sourceforge/trackballs/SixLevels.tar.gz - source = trackballs.desktop - source = trackballs.patch - md5sums = 84e2e8bb68842a636da91673751279a0 - md5sums = 2bb730894a85334a681cfd9f40fe075e - md5sums = 831053e0375b14c905b6cb534ea134a4 - md5sums = 3c383cf4b88330e6b14dea8881667ab9 + source = https://github.com/trackballs/trackballs/archive/v1.2.0.tar.gz + md5sums = 3fd42492c724f009d7da9144c45fa65f pkgname = trackballs @@ -3,37 +3,33 @@ # Contributor: Dany Martineau <dany.luc.martineau gmail.com> pkgname=trackballs -pkgver=1.1.4 -pkgrel=7 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Simple game similar to the classical game Marble Madness on the Amiga in the 80's" arch=('i686' 'x86_64') license=('GPL') url="http://trackballs.sourceforge.net/" depends=('guile1.8' 'sdl_ttf' 'sdl_image' 'sdl_mixer' 'mesa') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - http://downloads.sourceforge.net/sourceforge/$pkgname/SixLevels.tar.gz \ - trackballs.desktop trackballs.patch) -md5sums=('84e2e8bb68842a636da91673751279a0' '2bb730894a85334a681cfd9f40fe075e' \ - '831053e0375b14c905b6cb534ea134a4' '3c383cf4b88330e6b14dea8881667ab9' ) +source=(https://github.com/trackballs/trackballs/archive/v1.2.0.tar.gz) build() { cd ${srcdir}/$pkgname-$pkgver - patch -p1 < ../trackballs.patch - sed -i '5406s/guile/&1.8/' configure - sed -i '5452s/guile-config/&1.8/' configure - ./configure --prefix=/usr --with-sdl-prefix=/usr --disable-sdltest --with-highscores="~" - make + sed -i '/Icon=/s%.*%Icon=trackballs-64x64.png%' share/icons/trackballs.desktop + [ ! -d build ] && mkdir build + cd build + cmake ../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release } package() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver/build make DESTDIR=${pkgdir} install install -m644 ${srcdir}/*.map ${pkgdir}/usr/share/trackballs/levels install -m644 ${srcdir}/*.scm ${pkgdir}/usr/share/trackballs/levels install -m644 ${srcdir}/*.jpg ${pkgdir}/usr/share/trackballs/levels install -m644 ${srcdir}/*.set ${pkgdir}/usr/share/trackballs/levels - mkdir -p ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/trackballs.desktop \ - ${pkgdir}/usr/share/applications/ + mkdir -p ${pkgdir}/usr/share/{applications,pixmaps} + install -m644 ../share/icons/trackballs.desktop ${pkgdir}/usr/share/applications + install -m644 ../share/icons/*.png ${pkgdir}/usr/share/pixmaps } +md5sums=('3fd42492c724f009d7da9144c45fa65f') diff --git a/trackballs.desktop b/trackballs.desktop deleted file mode 100644 index 5cf51a7b13ed..000000000000 --- a/trackballs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Trackballs -Comment=Simple game similar to the classical game Marble Madness -Exec=trackballs -Icon=/usr/share/icons/hicolor/32x32/apps/trackballs.png -Terminal=false -Type=Application -Categories=Application;Game;ArcadeGame diff --git a/trackballs.patch b/trackballs.patch deleted file mode 100644 index ac2b124648b5..000000000000 --- a/trackballs.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- trackballs-1.1.4.orig/src/mmad.cc -+++ trackballs-1.1.4/src/mmad.cc -@@ -255,7 +255,7 @@ - } - - /* Initialize SDL */ -- if((SDL_Init(SDL_INIT_VIDEO|audio|SDL_INIT_JOYSTICK)==-1)) { -+ if((SDL_Init(SDL_INIT_NOPARACHUTE|SDL_INIT_VIDEO|audio|SDL_INIT_JOYSTICK)==-1)) { - printf(_("Could not initialize libSDL.\nError message: '%s'\n"), SDL_GetError()); - exit(-1); - } - ---- trackballs-1.1.4.orig/share/icons/Makefile.in -+++ trackballs-1.1.4/share/icons/Makefile.in -@@ -374,12 +374,12 @@ - echo "Exec=$(bindir)/trackballs" >> trackballs.desktop - - install-iconsDATA: -- $(mkinstalldirs) $(iconsdir)/32x32/apps -- $(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(iconsdir)/32x32/apps/trackballs.png -- $(mkinstalldirs) $(iconsdir)/48x48/apps -- $(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(iconsdir)/48x48/apps/trackballs.png -- $(mkinstalldirs) $(iconsdir)/64x64/apps -- $(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(iconsdir)/64x64/apps/trackballs.png -+ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/32x32/apps -+ $(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png -+ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/48x48/apps -+ $(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png -+ $(mkinstalldirs) $(DESTDIR)$(iconsdir)/64x64/apps -+ $(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png - - uninstall-iconsDATA: - -rm -f $(iconsdir)/32x32/apps/trackballs.png - -diff -up trackballs-1.1.4/src/map.cc~ trackballs-1.1.4/src/map.cc ---- trackballs-1.1.4/src/map.cc~ 2008-01-03 14:31:28.000000000 +0100 -+++ trackballs-1.1.4/src/map.cc 2008-01-03 14:31:28.000000000 +0100 -@@ -479,7 +479,7 @@ double smoothSemiRand(int x,int y,double - void Map::drawCell(int birdsEye,int stage,int x,int y) { - Coord3d normal,normal1; - Real texScale = 0.25; -- int i,draw; -+ int i; - int gfx_details = Settings::settings->gfx_details; - double txOffset=0.0,tyOffset=0.0; - Cell& c = cell(x,y); -@@ -615,7 +615,7 @@ void Map::drawCell(int birdsEye,int stag - - /* Draw south side of cell */ - { -- Cell& c2 = cell(x,y-1); draw=0; -+ Cell& c2 = cell(x,y-1); - int southTransparent=c.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 || - c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95; - if((southTransparent && stage==1) || (!southTransparent && stage==0) || !isTransparent) -@@ -624,11 +624,10 @@ void Map::drawCell(int birdsEye,int stag - if(c2.heights[Cell::NORTH+Cell::WEST] < c.heights[Cell::SOUTH+Cell::WEST] || - c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::EAST]) { - glNormal3f(0.0,-1.0,0.0); -- draw=1; - } else - glNormal3f(0.0,+1.0,0.0); - -- if(birdsEye || draw) { -+ { - glBegin(GL_TRIANGLE_STRIP); - glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::NORTH+Cell::EAST]); - glVertex3f(x+1.01,y,c2.heights[Cell::NORTH+Cell::EAST]); -@@ -645,7 +644,7 @@ void Map::drawCell(int birdsEye,int stag - - /* Draw west side of cell */ - { -- Cell& c2 = cell(x-1,y); draw=0; -+ Cell& c2 = cell(x-1,y); - int westTransparent=c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 || c.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95 || - c2.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95; - if((westTransparent && stage==1) || (!westTransparent && stage==0) || !isTransparent) -@@ -654,11 +653,10 @@ void Map::drawCell(int birdsEye,int stag - if(c2.heights[Cell::SOUTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::WEST] || - c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::NORTH+Cell::WEST]) { - glNormal3f(-1.0,0.0,0.0); -- draw=1; - } else - glNormal3f(+1.0,0.0,0.0); - -- if(birdsEye || draw) { -+ { - glColor4f(0.0,0.0,0.0,1.0); - glBegin(GL_TRIANGLE_STRIP); - glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::SOUTH+Cell::EAST]);
\ No newline at end of file |