From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SYeCY-0005IB-6X for garchives@archives.gentoo.org; Sun, 27 May 2012 14:12:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52CEDE072E; Sun, 27 May 2012 14:12:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 03086E072E for ; Sun, 27 May 2012 14:12:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 869BF1B401C for ; Sun, 27 May 2012 14:12:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 36815E5430 for ; Sun, 27 May 2012 14:11:59 +0000 (UTC) From: "Azamat H. Hackimov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Azamat H. Hackimov" Message-ID: <1338127808.00cc8dbd9d522ebacda858cad6b124824316da09.winterheart@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-action/supertuxkart/files/supertuxkart-0.7.2.patch games-action/supertuxkart/files/supertuxkart-0.7.3-fribidi-cmake.patch games-action/supertuxkart/files/supertuxkart-0.7.3-install-rules-cmake.patch games-action/supertuxkart/files/supertuxkart-0.7.3-irrlicht-fix.patch games-action/supertuxkart/metadata.xml games-action/supertuxkart/supertuxkart-0.7.2.ebuild games-action/supertuxkart/supertuxkart-0.7.3.ebuild X-VCS-Directories: games-action/supertuxkart/ games-action/supertuxkart/files/ X-VCS-Committer: winterheart X-VCS-Committer-Name: Azamat H. Hackimov X-VCS-Revision: 00cc8dbd9d522ebacda858cad6b124824316da09 X-VCS-Branch: master Date: Sun, 27 May 2012 14:11:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ae92b64a-b55b-421c-837e-84ecdf3e23ac X-Archives-Hash: c448116db27bf88151477629908e96a6 commit: 00cc8dbd9d522ebacda858cad6b124824316da09 Author: Azamat H. Hackimov gmail com> AuthorDate: Sun May 27 14:10:08 2012 +0000 Commit: Azamat H. Hackimov gentoo ru> CommitDate: Sun May 27 14:10:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3D00cc8dbd [games-action/supertuxkart] New version 0.7.3 Now with CMake buildsystem. (Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit) --- .../supertuxkart/files/supertuxkart-0.7.2.patch | 224 --------------= ------ .../files/supertuxkart-0.7.3-fribidi-cmake.patch | 54 +++++ .../supertuxkart-0.7.3-install-rules-cmake.patch | 38 ++++ .../files/supertuxkart-0.7.3-irrlicht-fix.patch | 24 ++ games-action/supertuxkart/metadata.xml | 1 - .../supertuxkart/supertuxkart-0.7.2.ebuild | 49 ----- .../supertuxkart/supertuxkart-0.7.3.ebuild | 56 +++++ 7 files changed, 172 insertions(+), 274 deletions(-) diff --git a/games-action/supertuxkart/files/supertuxkart-0.7.2.patch b/g= ames-action/supertuxkart/files/supertuxkart-0.7.2.patch deleted file mode 100644 index 35cb214..0000000 --- a/games-action/supertuxkart/files/supertuxkart-0.7.2.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff -uNr supertuxkart-0.7.2_orig//configure.ac supertuxkart-0.7.2/confi= gure.ac ---- supertuxkart-0.7.2_orig//configure.ac 2011-07-15 18:34:29.000000000 = +0700 -+++ supertuxkart-0.7.2/configure.ac 2011-07-28 19:34:43.192159546 +0700 -@@ -106,7 +106,7 @@ - LIBS=3D$save_LIBS - if test "x$ac_cv_search_glNewList" =3D "x-lGLcore"; then - # if GLcore found, then also check for GL -- AC_SEARCH_LIBS(glXCreateContext, GL) -+ AC_SEARCH_LIBS(gluLookAt, GLU) - fi - ;; - esac -@@ -244,7 +244,7 @@ - # ---- Check these flags do work by building a small irrLicht sample - echo "checking for irrlicht libraries..." - save_LIBS=3D$LIBS --LIBS=3D"$LIBS $irrlicht_LIBS $opengl_LIBS" -+LIBS=3D"$LIBS $irrlicht_LIBS $opengl_LIBS -lm -lz -lX11" -=20 - irrlicht_sample_built_fine=3D"false" -=20 -@@ -402,7 +402,6 @@ - enet_LIBS=3D"-Lenet -lenet" - ;; - esac --ENETTREE=3D"src/enet" -=20 - # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - # Check for a known compiler bug, details in=20 -@@ -453,7 +452,6 @@ - src/ide/Makefile \ - src/bullet/Makefile \ - src/bullet/src/Makefile \ -- src/enet/Makefile \ - ]) - AC_OUTPUT - echo -e $SUMMARY -diff -uNr supertuxkart-0.7.2_orig//data/challenges/Makefile.am supertuxk= art-0.7.2/data/challenges/Makefile.am ---- supertuxkart-0.7.2_orig//data/challenges/Makefile.am 2011-06-14 06:0= 8:42.000000000 +0700 -+++ supertuxkart-0.7.2/data/challenges/Makefile.am 2011-07-28 19:35:53.7= 01159576 +0700 -@@ -1,5 +1,5 @@ - # challenges/ -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/challenges -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/challenges -=20 - nobase_dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.challenge= ")=20 -diff -uNr supertuxkart-0.7.2_orig//data/fonts/Makefile.am supertuxkart-0= .7.2/data/fonts/Makefile.am ---- supertuxkart-0.7.2_orig//data/fonts/Makefile.am 2011-06-14 06:08:26.= 000000000 +0700 -+++ supertuxkart-0.7.2/data/fonts/Makefile.am 2011-07-28 19:34:43.192159= 546 +0700 -@@ -1,6 +1,6 @@ - # data/fonts/ -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/fonts -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/fonts -=20 - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.png") \ - $(shell find $(srcdir) -name "*.xml") -diff -uNr supertuxkart-0.7.2_orig//data/gfx/Makefile.am supertuxkart-0.7= .2/data/gfx/Makefile.am ---- supertuxkart-0.7.2_orig//data/gfx/Makefile.am 2011-06-14 06:08:40.00= 0000000 +0700 -+++ supertuxkart-0.7.2/data/gfx/Makefile.am 2011-07-28 19:35:43.48815957= 0 +0700 -@@ -1,5 +1,5 @@ - #data/gfx -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/gfx -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/gfx - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.xml") -=20 -diff -uNr supertuxkart-0.7.2_orig//data/grandprix/Makefile.am supertuxka= rt-0.7.2/data/grandprix/Makefile.am ---- supertuxkart-0.7.2_orig//data/grandprix/Makefile.am 2011-06-14 06:08= :17.000000000 +0700 -+++ supertuxkart-0.7.2/data/grandprix/Makefile.am 2011-07-28 19:34:43.19= 3159546 +0700 -@@ -1,6 +1,6 @@ - # data/music -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/grandprix -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/grandprix -=20 - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.grandprix") \ - $(shell find $(srcdir) -name "*.challenge") \ -diff -uNr supertuxkart-0.7.2_orig//data/gui/Makefile.am supertuxkart-0.7= .2/data/gui/Makefile.am ---- supertuxkart-0.7.2_orig//data/gui/Makefile.am 2011-06-14 06:08:21.00= 0000000 +0700 -+++ supertuxkart-0.7.2/data/gui/Makefile.am 2011-07-28 19:34:43.19315954= 6 +0700 -@@ -1,6 +1,6 @@ - # data/gui/ -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/gui -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/gui -=20 - nobase_dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.png" = ) \ - $(shell find $(srcdir) -name "*.jpg" )= \ -diff -uNr supertuxkart-0.7.2_orig//data/karts/Makefile.am supertuxkart-0= .7.2/data/karts/Makefile.am ---- supertuxkart-0.7.2_orig//data/karts/Makefile.am 2011-06-14 06:08:11.= 000000000 +0700 -+++ supertuxkart-0.7.2/data/karts/Makefile.am 2011-07-28 19:34:43.193159= 546 +0700 -@@ -1,6 +1,6 @@ - # data/karts -=20 --pkgdatadir=3D $(datadir)/games/$(PACKAGE)/data/karts -+pkgdatadir=3D $(datadir)/$(PACKAGE)/data/karts -=20 - nobase_dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "materials.xm= l") \ - $(shell find $(srcdir) -name "*.png") = \ -diff -uNr supertuxkart-0.7.2_orig//data/Makefile.am supertuxkart-0.7.2/d= ata/Makefile.am ---- supertuxkart-0.7.2_orig//data/Makefile.am 2011-06-14 06:08:25.000000= 000 +0700 -+++ supertuxkart-0.7.2/data/Makefile.am 2011-07-28 19:34:43.193159546 +0= 700 -@@ -1,7 +1,7 @@ - # data/ -=20 - SUBDIRS =3D challenges fonts gfx gui karts models music po sfx textu= res tracks grandprix --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data -=20 - dist_pkgdata_DATA =3D \ - $(shell find $(srcdir) -name "*.data") \ -@@ -13,16 +13,3 @@ - stk_config.xml powerup.xml items.xml \ - CREDITS -=20 --desktopdir =3D $(prefix)/share/applications --desktop_DATA =3D supertuxkart.desktop -- --icondir =3D $(prefix)/share/pixmaps --dist_icon_DATA =3D supertuxkart_32.xpm supertuxkart_64.xpm -- -- --# The desktop file needs the absolute path to the binary --# since e.g. /usr/games might not be in the standard path --EXTRA_DIST =3D supertuxkart_desktop.template --CLEANFILES =3D supertuxkart.desktop --supertuxkart.desktop: Makefile supertuxkart_desktop.template -- sed 's#PREFIX#$(prefix)#' $(srcdir)/supertuxkart_desktop.template >sup= ertuxkart.desktop -diff -uNr supertuxkart-0.7.2_orig//data/models/Makefile.am supertuxkart-= 0.7.2/data/models/Makefile.am ---- supertuxkart-0.7.2_orig//data/models/Makefile.am 2011-06-14 06:08:25= .000000000 +0700 -+++ supertuxkart-0.7.2/data/models/Makefile.am 2011-07-28 19:34:43.19415= 9546 +0700 -@@ -1,6 +1,6 @@ - # data/models/ -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/models -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/models -=20 - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.b3d") \ - $(shell find $(srcdir) -name "*.png") \ -diff -uNr supertuxkart-0.7.2_orig//data/music/Makefile.am supertuxkart-0= .7.2/data/music/Makefile.am ---- supertuxkart-0.7.2_orig//data/music/Makefile.am 2011-06-14 06:08:29.= 000000000 +0700 -+++ supertuxkart-0.7.2/data/music/Makefile.am 2011-07-28 19:34:43.194159= 546 +0700 -@@ -1,6 +1,6 @@ - # data/music -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/music -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/music -=20 - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.ogg") \ - $(shell find $(srcdir) -name "*.music") \ -diff -uNr supertuxkart-0.7.2_orig//data/po/Makefile.am supertuxkart-0.7.= 2/data/po/Makefile.am ---- supertuxkart-0.7.2_orig//data/po/Makefile.am 2011-06-14 06:07:23.000= 000000 +0700 -+++ supertuxkart-0.7.2/data/po/Makefile.am 2011-07-28 19:34:43.194159546= +0700 -@@ -1,6 +1,6 @@ - # data/po/ -=20 --pkgdatadir =3D $(datadir)/games/@PACKAGE@/data/po -+pkgdatadir =3D $(datadir)/@PACKAGE@/data/po -=20 - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.po") \ - supertuxkart.pot -diff -uNr supertuxkart-0.7.2_orig//data/sfx/Makefile.am supertuxkart-0.7= .2/data/sfx/Makefile.am ---- supertuxkart-0.7.2_orig//data/sfx/Makefile.am 2011-06-14 06:08:23.00= 0000000 +0700 -+++ supertuxkart-0.7.2/data/sfx/Makefile.am 2011-07-28 19:34:43.19415954= 6 +0700 -@@ -1,6 +1,6 @@ - # sfx/ -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/sfx -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/sfx -=20 - nobase_dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.ogg") = \ - $(shell find $(srcdir) -name "sfx.xml") = \ -diff -uNr supertuxkart-0.7.2_orig//data/textures/Makefile.am supertuxkar= t-0.7.2/data/textures/Makefile.am ---- supertuxkart-0.7.2_orig//data/textures/Makefile.am 2011-06-14 06:08:= 39.000000000 +0700 -+++ supertuxkart-0.7.2/data/textures/Makefile.am 2011-07-28 19:34:43.195= 159546 +0700 -@@ -1,6 +1,6 @@ - # data/textures -=20 --pkgdatadir =3D $(datadir)/games/$(PACKAGE)/data/textures -+pkgdatadir =3D $(datadir)/$(PACKAGE)/data/textures - dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.png") \ - $(shell find $(srcdir) -name "*.jpg") \ - materials.xml License.txt -diff -uNr supertuxkart-0.7.2_orig//data/tracks/Makefile.am supertuxkart-= 0.7.2/data/tracks/Makefile.am ---- supertuxkart-0.7.2_orig//data/tracks/Makefile.am 2011-06-14 06:07:50= .000000000 +0700 -+++ supertuxkart-0.7.2/data/tracks/Makefile.am 2011-07-28 19:34:43.19515= 9546 +0700 -@@ -1,6 +1,6 @@ - # data/tracks -=20 --pkgdatadir=3D $(datadir)/games/$(PACKAGE)/data/tracks -+pkgdatadir=3D $(datadir)/$(PACKAGE)/data/tracks - nobase_dist_pkgdata_DATA =3D $(shell find $(srcdir) -name "*.jpg") = \ - $(shell find $(srcdir) -name "*.JPG") = \ - $(shell find $(srcdir) -name "*.png") = \ -diff -uNr supertuxkart-0.7.2_orig//Makefile.am supertuxkart-0.7.2/Makefi= le.am ---- supertuxkart-0.7.2_orig//Makefile.am 2011-06-14 06:07:14.000000000 += 0700 -+++ supertuxkart-0.7.2/Makefile.am 2011-07-28 19:34:43.195159546 +0700 -@@ -1,8 +1,6 @@ - ACLOCAL_AMFLAGS =3D -I m4 -=20 --SUBDIRS =3D $(BULLETTREE) $(ENETTREE) src doc data -+SUBDIRS =3D $(BULLETTREE) $(ENETTREE) src data -=20 --pkgdatadir=3D$(datadir)/doc/$(PACKAGE) --dist_pkgdata_DATA=3DAUTHORS ChangeLog COPYING README - # NEWS only contains "see changelog" - # CHANGES only contains "see NEW" -diff -uNr supertuxkart-0.7.2_orig//src/Makefile.am supertuxkart-0.7.2/sr= c/Makefile.am ---- supertuxkart-0.7.2_orig//src/Makefile.am 2011-06-14 06:09:33.0000000= 00 +0700 -+++ supertuxkart-0.7.2/src/Makefile.am 2011-07-28 19:34:43.196159546 +07= 00 -@@ -2,10 +2,9 @@ -=20 - SUBDIRS =3D ide -=20 --bindir=3D$(prefix)/games - bin_PROGRAMS =3D supertuxkart -=20 --AM_CPPFLAGS =3D -DSUPERTUXKART_DATADIR=3D"\"$(datadir)/games/$(PACKAGE)= /\"" \ -+AM_CPPFLAGS =3D -DSUPERTUXKART_DATADIR=3D"\"$(datadir)/$(PACKAGE)/\"" = \ - -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/ -=20 - supertuxkart_SOURCES =3D \ diff --git a/games-action/supertuxkart/files/supertuxkart-0.7.3-fribidi-c= make.patch b/games-action/supertuxkart/files/supertuxkart-0.7.3-fribidi-c= make.patch new file mode 100644 index 0000000..568353b --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-0.7.3-fribidi-cmake.pa= tch @@ -0,0 +1,54 @@ +--- CMakeLists.txt.old 2012-05-27 17:18:07.539203698 +0600 ++++ CMakeLists.txt 2012-05-27 18:02:01.665294649 +0600 +@@ -124,22 +124,24 @@ +=20 + # Fribidi + if(USE_FRIBIDI) +- FIND_PATH(FRIBIDI_INCLUDE_DIR fribidi/fribidi.h +- /usr/local/include +- /usr/include +- ) +- +- SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) +- FIND_LIBRARY(FRIBIDI_LIBRARY +- NAMES ${FRIBIDI_NAMES} +- PATHS /usr/lib /usr/local/lib +- ) ++ find_package(PkgConfig) ++ pkg_check_modules(FRIBIDI REQUIRED fribidi) ++ if (FRIBIDI_FOUND) ++ include_directories(${FRIBIDI_INCLUDE_DIRS}) ++ else() ++ message(FATAL_ERROR "-- fribidi not found") ++ endif(FRIBIDI_FOUND) +=20 +- IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR) +- message("-- Fribidi found") +- else() +- message(FATAL_ERROR "Fribidi not found. Either install fribidi = or disable bidi support with -DUSE_FRIBIDI=3D0 (if you don't use a right-= to-left language then you don't need this).") +- endif() ++ ++ ++ # set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY}) ++ # set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR}) ++ # include(FindPackageHandleStandardArgs) ++ # find_package_handle_standard_args(Fribidi=20 ++ # DEFAULT_MSG=20 ++ # FRIBIDI_LIBRARY ++ # FRIBIDI_INCLUDE_DIR ++ # ) + endif() + =20 + # Set some compiler options +@@ -701,9 +703,9 @@ +=20 + if(USE_FRIBIDI) + if(APPLE) +- target_link_libraries(supertuxkart /Library/Frameworks/fribidi.fra= mework) ++ target_link_libraries(supertuxkart /Library/Frameworks/fribidi.framewo= rk) + else() +- target_link_libraries(supertuxkart fribidi) ++ target_link_libraries(supertuxkart ${FRIBIDI_LIBRARIES}) + endif() + add_definitions(-DENABLE_BIDI=3D1) + endif() diff --git a/games-action/supertuxkart/files/supertuxkart-0.7.3-install-r= ules-cmake.patch b/games-action/supertuxkart/files/supertuxkart-0.7.3-ins= tall-rules-cmake.patch new file mode 100644 index 0000000..b7d6cfe --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-0.7.3-install-rules-cm= ake.patch @@ -0,0 +1,38 @@ +--- CMakeLists.txt.old 2012-05-27 18:28:45.355350020 +0600 ++++ CMakeLists.txt 2012-05-27 18:51:19.202396766 +0600 +@@ -11,6 +11,13 @@ + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") + set(PROJECT_VERSION "0.7.3") +=20 ++# Additions for properly install ++set(SUPERTUXKART_DATADIR "${CMAKE_INSTALL_PREFIX}/share/games/supertuxk= art" ++ CACHE PATH "") ++set(SUPERTUXKART_BINDIR "bin" CACHE PATH "") ++set(SUPERTUXKART_ICONDIR "share/pixmaps" CACHE PATH "") ++set(SUPERTUXKART_DESKTOPDIR "share/applications" CACHE PATH "") ++ + # Tweakable values + if(CMAKE_BUILD_TYPE MATCHES "Debug") + set(DEBUG ON) +@@ -684,7 +691,7 @@ +=20 + else() +=20 +- add_definitions(-DSUPERTUXKART_DATADIR=3D\"${CMAKE_INSTALL_PREFIX}/= share/games/supertuxkart\") ++ add_definitions(-DSUPERTUXKART_DATADIR=3D\"${SUPERTUXKART_DATADIR}\= ") +=20 + # Build the final executable + add_executable(supertuxkart ${SRCS}) +@@ -764,9 +771,9 @@ + endforeach() +=20 +=20 +-install(TARGETS supertuxkart RUNTIME DESTINATION games BUNDLE DESTINATI= ON .) +-install(FILES data/supertuxkart.desktop DESTINATION share/applications) +-install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINA= TION share/pixmaps) ++install(TARGETS supertuxkart RUNTIME DESTINATION ${SUPERTUXKART_BINDIR}= BUNDLE DESTINATION .) ++install(FILES data/supertuxkart.desktop DESTINATION ${SUPERTUXKART_DESK= TOPDIR}) ++install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINA= TION ${SUPERTUXKART_ICONDIR}) +=20 + add_custom_target(GenerateDesktopFile + COMMAND sed 's\#PREFIX\#${CMAKE_INSTALL_PREFIX}\#' ${= CMAKE_CURRENT_SOURCE_DIR}/data/supertuxkart_desktop.template | sed 's\#VE= RSION\#${PROJECT_VERSION}\#' > ${CMAKE_CURRENT_SOURCE_DIR}/data/supertuxk= art.desktop diff --git a/games-action/supertuxkart/files/supertuxkart-0.7.3-irrlicht-= fix.patch b/games-action/supertuxkart/files/supertuxkart-0.7.3-irrlicht-f= ix.patch new file mode 100644 index 0000000..d9dc6ab --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-0.7.3-irrlicht-fix.pat= ch @@ -0,0 +1,24 @@ +diff -Nuar supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp supe= rtuxkart-0.7.3.work/src/guiengine/widgets/CGUIEditBox.cpp +--- supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.cpp 2011-11-02 = 06:04:13.000000000 +0600 ++++ supertuxkart-0.7.3.work/src/guiengine/widgets/CGUIEditBox.cpp 2011-1= 1-15 15:07:05.252312002 +0600 +@@ -115,7 +115,7 @@ + } +=20 +=20 +-video::SColor const& CGUIEditBox::getOverrideColor() const ++video::SColor CGUIEditBox::getOverrideColor() const + { + return OverrideColor; + } +diff -Nuar supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h supert= uxkart-0.7.3.work/src/guiengine/widgets/CGUIEditBox.h +--- supertuxkart-0.7.3/src/guiengine/widgets/CGUIEditBox.h 2011-11-02 06= :04:12.000000000 +0600 ++++ supertuxkart-0.7.3.work/src/guiengine/widgets/CGUIEditBox.h 2011-11-= 15 15:06:28.587310734 +0600 +@@ -36,7 +36,7 @@ + virtual void setOverrideColor(video::SColor color); +=20 + //! Gets the override color +- virtual video::SColor const & getOverrideColor() const; ++ virtual video::SColor getOverrideColor() const; +=20 + //! Sets if the text should use the overide color or the + //! color in the gui skin. diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supert= uxkart/metadata.xml index 8e85283..a097aa9 100644 --- a/games-action/supertuxkart/metadata.xml +++ b/games-action/supertuxkart/metadata.xml @@ -1,7 +1,6 @@ -no-herd azamat.hackimov@gmail.com Azamat H. Hackimov diff --git a/games-action/supertuxkart/supertuxkart-0.7.2.ebuild b/games-= action/supertuxkart/supertuxkart-0.7.2.ebuild deleted file mode 100644 index 076ce73..0000000 --- a/games-action/supertuxkart/supertuxkart-0.7.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/supertuxkar= t-0.7.ebuild,v 1.5 2011/06/22 12:59:19 tupone Exp $ - -EAPI=3D2 -inherit autotools flag-o-matic eutils games - -DESCRIPTION=3D"A kart racing game starring Tux, the linux penguin (TuxKa= rt fork)" -HOMEPAGE=3D"http://supertuxkart.sourceforge.net/" -SRC_URI=3D"mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src= .tar.bz2" - -LICENSE=3D"GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-2.0 CC= PL-Sampling-Plus-1.0 public-domain as-is" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"debug unicode" - -RDEPEND=3D">=3Ddev-games/irrlicht-1.8 - virtual/opengl - media-libs/freeglut - virtual/glu - net-libs/enet:1.3 - media-libs/libvorbis - media-libs/openal - unicode? ( dev-libs/fribidi )" -DEPEND=3D"${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/"${P}".patch - rm -rf src/enet - mkdir "${S}"/m4 - eautoreconf -} - -src_configure() { - append-libs -lpng -ljpeg -lbz2 - - egamesconf \ - --disable-dependency-tracking \ - --disable-optimization \ - $(use_enable debug) -} - -src_install() { - emake DESTDIR=3D"${D}" install || die - doicon data/${PN}_64.xpm - make_desktop_entry ${PN} SuperTuxKart ${PN}_64 - dodoc AUTHORS ChangeLog README TODO - prepgamesdirs -} diff --git a/games-action/supertuxkart/supertuxkart-0.7.3.ebuild b/games-= action/supertuxkart/supertuxkart-0.7.3.ebuild new file mode 100644 index 0000000..f5828a3 --- /dev/null +++ b/games-action/supertuxkart/supertuxkart-0.7.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D3 +inherit cmake-utils games + +DESCRIPTION=3D"A kart racing game starring Tux, the linux penguin (TuxKa= rt fork)" +HOMEPAGE=3D"http://supertuxkart.sourceforge.net/" +SRC_URI=3D"mirror://sourceforge/supertuxkart/SuperTuxKart/${PV}/${P}-src= .tar.bz2" + +LICENSE=3D"GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-2.0 CC= PL-Sampling-Plus-1.0 public-domain as-is" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"debug unicode" + +RDEPEND=3D">=3Ddev-games/irrlicht-1.8 + virtual/opengl + net-libs/enet:1.3 + media-libs/libvorbis + media-libs/openal + net-misc/curl + unicode? ( dev-libs/fribidi )" +DEPEND=3D"${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-irrlicht-fix.patch + epatch "${FILESDIR}"/${P}-fribidi-cmake.patch + epatch "${FILESDIR}"/${P}-install-rules-cmake.patch + # Remove bundled enet library + sed -i -e '/add_subdirectory("${STK_SOURCE_DIR}\/enet")/d' \ + -e '/include_directories("${STK_SOURCE_DIR}\/enet\/include")/d' \ + -e '\/src\/enet\/include\/enet/d' \ + CMakeLists.txt || die + sed -i -e "s:PREFIX/games/supertuxkart:${GAMES_BINDIR}/${PN}:" \ + data/supertuxkart_desktop.template || die + # Remove bundled bullet library - still no works +# sed -i -e '/add_subdirectory("${STK_SOURCE_DIR}\/bullet")/d' \ +# -e '/include_directories("${STK_SOURCE_DIR}\/bullet\/src")/d' \ +# CMakeLists.txt +} + +src_configure() { + mycmakeargs=3D( + -DSUPERTUXKART_BINDIR=3D"${GAMES_BINDIR}" + -DSUPERTUXKART_DATADIR=3D"${GAMES_DATADIR}/${PN}" + $(cmake-utils_use_use unicode FRIBIDI) + ) + cmake-utils_src_configure +} + +src_install() { + DOCS=3D"README" + cmake-utils_src_install + prepgamesdirs +}