From ff98ec6d084ecd9f5f6186c69c01fd09b6042e2e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 10 May 2019 22:15:44 +0100 Subject: games-action/supertuxkart: Drop old 0.9.3 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: James Le Cuirot --- games-action/supertuxkart/Manifest | 1 - .../files/supertuxkart-0.9.3-fix-buildsystem.patch | 103 --------------------- .../files/supertuxkart-0.9.3-intrin.patch | 56 ----------- .../supertuxkart-0.9.3-irrlicht-bundled-libs.patch | 33 ------- .../files/supertuxkart-0.9.3-unbundle-enet.patch | 57 ------------ .../files/supertuxkart-0.9.3-unbundle-libs.patch | 19 ---- .../supertuxkart/supertuxkart-0.9.3.ebuild | 91 ------------------ 7 files changed, 360 deletions(-) delete mode 100644 games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch delete mode 100644 games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch delete mode 100644 games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch delete mode 100644 games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch delete mode 100644 games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch delete mode 100644 games-action/supertuxkart/supertuxkart-0.9.3.ebuild (limited to 'games-action') diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest index d64bb151b7dc..5a0e070b25a8 100644 --- a/games-action/supertuxkart/Manifest +++ b/games-action/supertuxkart/Manifest @@ -1,3 +1,2 @@ -DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb SHA512 29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9 DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28 SHA512 182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch deleted file mode 100644 index def5c80340ba..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch +++ /dev/null @@ -1,103 +0,0 @@ -* Unbundle remaining libraries: GLEW, zlib, png, jpeg -* Add -DAS_DEPRECATED for Angelscript -* Remove definition of debug macros -* Build bundled Irrlicht with user flags - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,43 +110,11 @@ - include_directories(${ENET_INCLUDE_DIR}) - - # Build glew library - if(NOT USE_GLES2 AND NOT SERVER_ONLY) -+ find_package(GLEW REQUIRED) -+ include_directories(${GLEW_INCLUDE_DIRS}) - add_definitions(-DGLEW_NO_GLU) -- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew") -- include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include") - endif() - --if(MSVC OR APPLE) -- if (NOT APPLE) -- # Build zlib library -- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib") -- include_directories("${PROJECT_SOURCE_DIR}/lib/zlib") -- -- set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/") -- set(ZLIB_LIBRARY zlibstatic) -- endif() -- -- # Build png library -- set(SKIP_INSTALL_ALL TRUE) -- set(PNG_STATIC TRUE CACHE BOOL "Build static lib") -- set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests") -- set(PNG_SHARED FALSE CACHE BOOL "Build shared lib") -- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng") -- include_directories("${PROJECT_SOURCE_DIR}/lib/libpng") -- -- set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/") -- set(PNG_LIBRARY png_static) --endif() -- --# Add jpeg library --if (APPLE) -- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib") -- include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib") -- set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/") -- set(JPEG_LIBRARY jpeglib) --else() -- find_package(JPEG REQUIRED) -- include_directories(${JPEG_INCLUDE_DIR}) --endif() - - if (BUILD_RECORDER) -@@ -206,6 +174,7 @@ - find_package(Angelscript) - if(ANGELSCRIPT_FOUND) - include_directories(${Angelscript_INCLUDE_DIRS}) -+ add_definitions(-DAS_DEPRECATED) - else() - message(FATAL_ERROR "Angelscript not found. " - "Either install angelscript or use built-in version using " -@@ -307,14 +276,6 @@ - # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode. - # Since STK uses DEBUG, this is added for debug compilation only: - set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG) --else() -- # All non VS generators used create only a single compile mode, so -- # compile flags can be simplye be added -- if(CMAKE_BUILD_TYPE MATCHES Debug) -- add_definitions(-DDEBUG) -- else() -- add_definitions(-DNDEBUG) -- endif() - endif() - - # TODO: remove this switch -@@ -426,7 +395,7 @@ - if(NOT SERVER_ONLY) - if(NOT USE_GLES2) -- target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils) -+ target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} graphics_utils) - else() - target_link_libraries(supertuxkart GLESv2) - endif() - endif() ---- a/lib/irrlicht/CMakeLists.txt -+++ b/lib/irrlicht/CMakeLists.txt -@@ -68,15 +68,6 @@ - if(WIN32) - add_definitions(-D_IRR_STATIC_LIB_) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff --else() -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing") -- if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations") -- endif() -- if(CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexpensive-optimizations") -- endif() - endif() - - if(USE_GLES2) diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch deleted file mode 100644 index 75830b8ba8f2..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001 -From: Benau -Date: Sun, 14 Jan 2018 10:19:37 +0800 -Subject: [PATCH] Fix #3091 - ---- - lib/graphics_utils/mipmap/cpusimd.h | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h -index 1dc2c730b2..5e2cf30e5f 100644 ---- a/lib/graphics_utils/mipmap/cpusimd.h -+++ b/lib/graphics_utils/mipmap/cpusimd.h -@@ -38,11 +38,11 @@ - #include - #define CPU_MMX_SUPPORT (1) - #endif --#if __SSE__ || _M_X64 || _M_IX86_FP >= 1 || CPU_ENABLE_SSE -+#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE - #include - #define CPU_SSE_SUPPORT (1) - #endif --#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2 || CPU_ENABLE_SSE2 -+#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2 - #include - #define CPU_SSE2_SUPPORT (1) - #endif -@@ -95,23 +95,23 @@ - #define CPU_POPCNT_SUPPORT (1) - #endif - #if __LZCNT__ || CPU_ENABLE_LZCNT -- #include -+ #include - #define CPU_LZCNT_SUPPORT (1) - #endif - #if __F16C__ || CPU_ENABLE_F16C -- #include -+ #include - #define CPU_F16C_SUPPORT (1) - #endif - #if __BMI__ || CPU_ENABLE_BMI -- #include -+ #include - #define CPU_BMI_SUPPORT (1) - #endif - #if __BMI2__ || CPU_ENABLE_BMI2 -- #include -+ #include - #define CPU_BMI2_SUPPORT (1) - #endif - #if __TBM__ || CPU_ENABLE_TBM -- #include -+ #include - #define CPU_TBM_SUPPORT (1) - #endif - diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch deleted file mode 100644 index 194f278b958d..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Remove embedded libraries in Irrlicht source (flagged by lintian) - Since removing the subdirectories containing libjpeg/libpng/zlib/bzip2/lzma - would make this patch way too large, this patch should be applied on top of - rm -rf lib/jpeglib/ - rm -rf lib/zlib/ - rm -rf lib/libpng/ - in debian/rules (e.g. in the clean target). -Forwarded: no -Author: Vincent Cheng -Last-Update: 2016-07-07 - ---- a/lib/irrlicht/CMakeLists.txt -+++ b/lib/irrlicht/CMakeLists.txt -@@ -2,9 +2,6 @@ - find_package(PNG REQUIRED) - find_package(JPEG REQUIRED) - --include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/" -- "${JPEG_INCLUDE_DIR}" -- "${PNG_INCLUDE_DIRS}" -- "${ZLIB_INCLUDE_DIR}") -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/) - - if(MSVC OR APPLE) -@@ -576,7 +573,7 @@ - endif() - - add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES}) - --target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY}) -+target_link_libraries(stkirrlicht png jpeg z) - - if(NOT SERVER_ONLY) diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch deleted file mode 100644 index 8c00fce7e186..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch +++ /dev/null @@ -1,57 +0,0 @@ -Description: Build supertuxkart against system enet instead of embedded copy -Forwarded: not-yet -Author: Vincent Cheng -Last-Update: 2016-07-17 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,9 +105,9 @@ - add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet") - include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src") - --# Build the ENet UDP network library --add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet") --include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include") -+# ENet -+find_package(ENet REQUIRED) -+include_directories(${ENET_INCLUDE_DIR}) - - # Build glew library - if(NOT USE_GLES2 AND NOT SERVER_ONLY) -@@ -406,10 +406,10 @@ - bulletdynamics - bulletcollision - bulletmath -- enet - stkirrlicht - ${Angelscript_LIBRARIES} - ${CURL_LIBRARIES} -+ ${ENET_LIBRARIES} - ${OGGVORBIS_LIBRARIES} - ${OPENAL_LIBRARY} - ${FREETYPE_LIBRARIES} ---- /dev/null -+++ b/cmake/FindENet.cmake -@@ -0,0 +1,22 @@ -+# - Find ENet -+# Find the ENet includes and libraries -+# -+# Following variables are provided: -+# ENET_FOUND -+# True if ENet has been found -+# ENET_INCLUDE_DIR -+# The include directories of ENet -+# ENET_LIBRARIES -+# ENet library list -+ -+ -+find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include) -+find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY) -+ -+# Publish variables -+set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR}) -+set(ENET_LIBRARIES ${ENET_LIBRARY}) -+mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY) diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch deleted file mode 100644 index 798a6cdea7ac..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Link against system copies of zlib/libpng/libjpeg/bzip2 -Forwarded: not-yet -Author: Vincent Cheng -Last-Update: 2016-07-17 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -416,6 +416,11 @@ - ${JPEG_LIBRARIES} - ${TURBOJPEG_LIBRARY} - #${VPX_LIBRARIES} -+ X11 -+ z -+ png -+ jpeg -+ bz2 - ) - - if(NOT SERVER_ONLY) diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild deleted file mode 100644 index 1e666dfcdc15..000000000000 --- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop gnome2-utils - -DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)" -HOMEPAGE="https://supertuxkart.net/" -SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz - mirror://gentoo/${PN}.png" - -LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fribidi recorder wiimote" - -# don't unbundle irrlicht and bullet -# both are modified and system versions will break the game -# https://sourceforge.net/p/irrlicht/feature-requests/138/ - -RDEPEND=" - media-libs/glew:0= - media-libs/libpng:0= - media-libs/libvorbis - media-libs/openal - net-libs/enet:1.3= - net-misc/curl - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/libintl - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - fribidi? ( dev-libs/fribidi ) - recorder? ( media-libs/libopenglrecorder ) - wiimote? ( net-wireless/bluez )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.3-intrin.patch - "${FILESDIR}"/${PN}-0.9.3-unbundle-enet.patch - "${FILESDIR}"/${PN}-0.9.3-unbundle-libs.patch - "${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch - "${FILESDIR}"/${PN}-0.9.3-irrlicht-bundled-libs.patch - "${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch - "${FILESDIR}"/${PN}-0.9.3-fix-buildsystem.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # remove bundled libraries, just to be sure - rm -r lib/{enet,glew,jpeglib,libpng,zlib} || die -} - -src_configure() { - local mycmakeargs=( - # system dev-libs/angelscript leads - # to failed assert segfaults - -DUSE_SYSTEM_ANGELSCRIPT=OFF - -DUSE_FRIBIDI=$(usex fribidi) - -DBUILD_RECORDER=$(usex recorder) - -DUSE_WIIUSE=$(usex wiimote) - -DSTK_INSTALL_BINARY_DIR=bin - -DSTK_INSTALL_DATA_DIR=share/${PN} - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc CHANGELOG.md - - doicon -s 64 "${DISTDIR}"/${PN}.png -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3-65-gdbad