From c27b571cf4e301f7ff5e327cf9b2d4750bd0deb4 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 18 Oct 2013 17:25:22 -0500 Subject: [PATCH] libsdl2: Finish cleanup * Delete old / broken / un-needed recipes * Clean up recipe requires. Haiku kits don't provide per-library dependencies yet --- media-libs/libsdl2/libsdl-2.0_hg.recipe | 29 ------------------ media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe | 30 ------------------- media-libs/libsdl2/libsdl2-2.0.0.recipe | 25 ++++++---------- 3 files changed, 9 insertions(+), 75 deletions(-) delete mode 100644 media-libs/libsdl2/libsdl-2.0_hg.recipe delete mode 100644 media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe diff --git a/media-libs/libsdl2/libsdl-2.0_hg.recipe b/media-libs/libsdl2/libsdl-2.0_hg.recipe deleted file mode 100644 index b2300d2b4..000000000 --- a/media-libs/libsdl2/libsdl-2.0_hg.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="hg+http://hg.libsdl.org/SDL" -#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="" -BUILD() -{ - cd libsdl-2.0-hg - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - DATADIR=`finddir B_COMMON_DATA_DIRECTORY` - mkdir build_haiku - cd build_haiku - ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --datadir=$DATADIR - make -} - -INSTALL() -{ - cd libsdl-2.0-hg/build_haiku - make install -} -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe b/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe deleted file mode 100644 index c421c0e28..000000000 --- a/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="hg+http://hg.libsdl.org/SDL" -#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="" -BUILD() -{ - cd libsdl-2.0-hg-cmake -# MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man -# LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` -# DATADIR=`finddir B_COMMON_DATA_DIRECTORY` -# mkdir build_haiku -# cd build_haiku -# ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ -# --libdir=$LIBDIR \ -# --mandir=$MANDIR \ -# --datadir=$DATADIR - cmake . - make -} - -INSTALL() -{ - cd libsdl-2.0-hg-cmake - make install -} -LICENSE="Zlib" -COPYRIGHT="1997-2013 Sam Lantinga" diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe index 29f7eb4da..e1f94e449 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -11,27 +11,20 @@ ARCHITECTURES="x86 x86_gcc2" PROVIDES=" libsdl2 = $portVersion compat >= 2.0 - lib:libsdl2 = $portVersion compat >= 2.0 - lib:libsdl2_2.0 = 0.0.0 compat >= 0.12 + lib:libSDL2 = 0.12.0 compat >= 0.12 + lib:libSDL2_2.0 = 0.12.0 compat >= 0.12 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libGL +# lib:libGL lib:libglu - lib:libroot - lib:libbe - lib:libmedia - lib:libgame - lib:libdevice - lib:libtextencoding lib:libpng lib:libjpeg lib:libtiff " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion # devel:mesa devel:libglu devel:libpng @@ -40,6 +33,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf cmd:libtool cmd:aclocal @@ -77,14 +71,13 @@ INSTALL() # ----- devel package ------------------------------------- PROVIDES_devel=" - cmd:sdl2_config = $portVersion compat >= 2.0 - devel:libSDL2_2.0 = 0.12.0 compat >= 0 - devel:libSDL2 = 0.12.0 compat >= 0 - devel:libSDL2main = 0.12.0 compat >= 0 - devel:libSDL2_test = 0.12.0 compat >= 0 + cmd:sdl2_config = $portVersion compat >= 2.0 + devel:libSDL2 = 0.12.0 compat >= 2.0 + devel:libSDL2main = 0.12.0 compat >= 0.12 + devel:libSDL2_test = 0.12.0 compat >= 0.12 + devel:libSDL2_2.0 = 0.12.0 compat >= 0.12 " REQUIRES_devel=" libsdl2 == $portVersion base " -