From bb952bd1baa2d178087d6201190fa8728fa6b645 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 1 Nov 2013 07:47:53 -0700 Subject: [PATCH] Fixed libsdl, libsdl2 and sdl_ttf, removed outdate sdl_ttf recipes. --- media-libs/libsdl/libsdl-1.2.15.recipe | 14 ++++++----- media-libs/libsdl2/libsdl2-2.0.1.recipe | 15 +++++------ media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe | 32 ------------------------ media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 24 ++++++++++-------- media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe | 28 --------------------- media-libs/sdl_ttf/sdl_ttf-2.0_.recipe | 32 ------------------------ 6 files changed, 29 insertions(+), 116 deletions(-) delete mode 100644 media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe delete mode 100644 media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe delete mode 100644 media-libs/sdl_ttf/sdl_ttf-2.0_.recipe diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index b7e407de8..30bb22595 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -11,8 +11,8 @@ ARCHITECTURES="x86 x86_gcc2" PROVIDES=" libsdl$secondaryArchSuffix = $portVersion - lib:libSDL$secondaryArchSuffix = 0.11.4 compat >= 0 - lib:libSDL_1.2$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 + lib:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 + lib:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -73,7 +73,9 @@ INSTALL() fixDevelopLibDirReferences $binDir/sdl-config packageEntries devel \ - $developDir $binDir/sdl-config + $developDir $binDir/sdl-config \ + $dataDir \ + $documentationDir } TEST() @@ -152,9 +154,9 @@ TEST() PROVIDES_devel=" libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2 cmd:sdl_config = $portVersion compat >= 1.2 - devel:libSDL$secondaryArchSuffix = 0.11.4 compat >= 0 - devel:libSDLmain$secondaryArchSuffix = 0.11.4 compat >= 0 - devel:libSDL_1.2$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 + devel:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 + devel:libSDLmain$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 + devel:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0 " REQUIRES_devel=" diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 66e6c479e..aa339bced 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -12,9 +12,9 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libsdl2$secondaryArchSuffix = $portVersion compat >= 2.0 - lib:libSDL2$secondaryArchSuffix = 0.1.0 compat >= 0.0 + lib:libSDL2$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0.0 lib:libSDL2_2.0$secondaryArchSuffix = 0.1.0 compat >= 0.0 - lib:libSDL2_2.0.1SsecondaryArchSuufix = 0.1.0 compat >= 0.0 + lib:libSDL2_2.0.1$secondaryArchSuufix = 0.1.0 compat >= 0.0 " REQUIRES=" @@ -61,7 +61,8 @@ INSTALL() prepareInstalledDevelLibs \ libSDL2 \ libSDL2main \ - libSDL2_test + libSDL2_test \ + libSDL2-2.0 fixPkgconfig fixDevelopLibDirReferences $binDir/sdl2-config @@ -73,10 +74,10 @@ INSTALL() # ----- devel package ------------------------------------- PROVIDES_devel=" libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 - cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0 - devel:libSDL2$secondaryArchSuffix = 2.0.1 compat >= 2.0 - devel:libSDL2main$secondaryArchSuffix = 0.1.0 compat >= 0.0 - devel:libSDL2_test$secondaryArchSuffix = 0.1.0 compat >= 0.0 + cmd:sdl2_config = $portVersion compat >= 2.0 + devel:libSDL2$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 + devel:libSDL2main$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 + devel:libSDL2_test$secondaryArchSuffix = 2.0_0.1.0 compat >= 2.0_0 devel:libSDL2_2.0$secondaryArchSuffix = 0.1.0 compat >= 0.0 devel:libSDL2_2.0.1$secondaryArchSuffix = 0.1.0 compat >= 0.0 " diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe deleted file mode 100644 index 7fd96a9d8..000000000 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" -SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.10.tar.gz" -CHECKSUM_MD5="814e6e17e8879254208d23b3b7e0354b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.12 - dev-util/pkgconfig >= 0.9" -BUILD() -{ - cd SDL_ttf-2.0.10 - rm -f acinclude.m4 - libtoolize --copy --force --install - aclocal --install -I acinclude - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL() -{ - cd SDL_ttf-2.0.10 - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2010 Sam Lantinga" diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index bad25b15d..cfc785882 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -16,28 +16,29 @@ COPYRIGHT="1997-2012 Sam Lantinga" REVISION="1" ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - sdl_ttf = $portVersion - lib:libSDL_ttf = $portVersion - devel:libSDL_ttf - lib:libSDL_ttf_2.0 = $portVersion + sdl_ttf$secondaryArchSuffix = $portVersion compat >= 1.2 + lib:libSDL_ttf$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0 + lib:libSDL_ttf_2.0$secondaryArchSuffix = 0.10.1 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion - libsdl >= 1.2.12 + haiku$secondaryArchSuffix >= $haikuVersion + libsdl >= 1.2 lib:libfreetype lib:libz " BUILD_PREREQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize cmd:aclocal cmd:automake cmd:autoconf cmd:gcc + cmd:ld cmd:sdl_config cmd:make cmd:freetype_config @@ -45,6 +46,7 @@ BUILD_PREREQUIRES=" " SOURCE_DIR="SDL_ttf-$portVersion" + BUILD() { libtoolize --copy --force --install @@ -66,11 +68,11 @@ INSTALL() } PROVIDES_devel=" - devel:SDL_ttf = 0.10.1 compat >= 0 - devel:libSDL_ttf = 0.10.1 compat >= 0 + sdl_ttf${secondaryArchSuffix}_devel = 2.0.11 compat >= 1.2 + devel:libSDL_ttf$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0 + devel:libSDL_ttf_2.0$secondaryArchSuffix = 0.10.1 compat >= 0 " REQUIRES_devel=" - sdl_ttf == $portVersion base + sdl_ttf$secondaryArchSuffix == $portVersion base " - diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe deleted file mode 100644 index b068d6603..000000000 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" -SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz" -CHECKSUM_MD5="6dd5a85e4924689a35a5fb1cb3336156" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd SDL_ttf-2.0.9 - rm aclocal.m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in - libtoolize --copy --force --install - aclocal -I m4 - touch NEWS AUTHORS ChangeLog - automake --add-missing --force-missing --warnings=none - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd SDL_ttf-2.0.9 - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2007 Sam Lantinga" diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe deleted file mode 100644 index b6bec4fe4..000000000 --- a/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" -SRC_URI="hg+http://hg.libsdl.org/SDL_ttf" -#CHECKSUM_MD5="814e6e17e8879254208d23b3b7e0354b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.12 - dev-util/pkgconfig >= 0.9" -BUILD() -{ - cd sdl-ttf-2.0-hg - rm -f acinclude.m4 - libtoolize --copy --force --install - aclocal --install -I acinclude - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL() -{ - cd sdl-ttf-2.0-hg - make install -} - -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga"