From c2f6992d981d175109186b3a7dd9bee8814db399 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 31 Oct 2013 02:52:15 -0700 Subject: [PATCH] WIP libsdl, added secondaryArchSuffix --- media-libs/libsdl/libsdl-1.2.12.recipe | 21 ---- media-libs/libsdl/libsdl-1.2.13.recipe | 21 ---- media-libs/libsdl/libsdl-1.2.14.recipe | 30 ------ media-libs/libsdl/libsdl-1.2.15.recipe | 28 ++--- media-libs/libsdl/libsdl-1.2_hg.recipe | 102 ------------------- media-libs/libsdl/libsdl-1.3_gsoc.recipe | 36 ------- media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe | 34 ------- 7 files changed, 15 insertions(+), 257 deletions(-) delete mode 100644 media-libs/libsdl/libsdl-1.2.12.recipe delete mode 100644 media-libs/libsdl/libsdl-1.2.13.recipe delete mode 100644 media-libs/libsdl/libsdl-1.2.14.recipe delete mode 100644 media-libs/libsdl/libsdl-1.2_hg.recipe delete mode 100644 media-libs/libsdl/libsdl-1.3_gsoc.recipe delete mode 100644 media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe diff --git a/media-libs/libsdl/libsdl-1.2.12.recipe b/media-libs/libsdl/libsdl-1.2.12.recipe deleted file mode 100644 index 602fc6123..000000000 --- a/media-libs/libsdl/libsdl-1.2.12.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/release/SDL-1.2.12.tar.gz" -CHECKSUM_MD5="544b4554986e51eed6d34435cf9c5f3f" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD() -{ - cd SDL-1.2.12 - ./configure --prefix=/boot/home/config - make -} - -INSTALL() -{ - cd SDL-1.2.12 - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2009 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.2.13.recipe b/media-libs/libsdl/libsdl-1.2.13.recipe deleted file mode 100644 index e75b3534d..000000000 --- a/media-libs/libsdl/libsdl-1.2.13.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/release/SDL-1.2.13.tar.gz" -CHECKSUM_MD5="c6660feea2a6834de10bc71b2f8e4d88" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd SDL-1.2.13 - ./configure --prefix=/boot/home/config - make -} - -INSTALL() -{ - cd SDL-1.2.13 - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2009 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.2.14.recipe b/media-libs/libsdl/libsdl-1.2.14.recipe deleted file mode 100644 index 30554ec8d..000000000 --- a/media-libs/libsdl/libsdl-1.2.14.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/release/SDL-1.2.14.tar.gz" -CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd SDL-1.2.14 - ./autogen.sh - rm aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in - libtoolize -fci - aclocal -I acinclude - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd SDL-1.2.14 - make install - -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2009 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index bc09d01e5..b7e407de8 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -10,22 +10,22 @@ COPYRIGHT="1997-2012 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" - libsdl = $portVersion compat >= 1.2 - lib:libSDL = 0.11.4 compat >= 0.11 - lib:libSDL_1.2 = 0.11.4 compat >= 0.11 + 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 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion -# lib:libGL - lib:libglu +# lib:libGL$secondaryArchSuffix + lib:libglu$secondaryArchSuffix lib:libpng lib:libjpeg lib:libtiff " BUILD_REQUIRES=" -# devel:mesa - devel:libglu +# devel:libGL$secondaryArchSuffix + devel:libglu$secondaryArchSuffix devel:libpng devel:libjpeg # devel:libtiff @@ -37,8 +37,9 @@ BUILD_PREREQUIRES=" cmd:libtool cmd:aclocal cmd:make - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:nasm " SOURCE_DIR="SDL-$portVersion" @@ -149,12 +150,13 @@ TEST() # ----- devel package ------------------------ PROVIDES_devel=" + libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2 cmd:sdl_config = $portVersion compat >= 1.2 - devel:libSDL = 0.11.4 compat >= 0.11 - devel:libSDLmain = 0.11.4 compat >= 0.11 - devel:libSDL_1.2 = 0.11.4 compat >= 0.11 + 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 " REQUIRES_devel=" - libsdl == $portVersion base + libsdl${secondaryArchSuffix} == $portVersion base " diff --git a/media-libs/libsdl/libsdl-1.2_hg.recipe b/media-libs/libsdl/libsdl-1.2_hg.recipe deleted file mode 100644 index 830489f2e..000000000 --- a/media-libs/libsdl/libsdl-1.2_hg.recipe +++ /dev/null @@ -1,102 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="hg+http://hg.libsdl.org/SDL#SDL-1.2" -#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libsdl-1.2-hg - cp `aclocal --print-ac-dir`/libtool.m4 acinclude - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - cp /boot/common/bin/libtool . - make -} - -INSTALL() -{ - cd libsdl-1.2-hg - make install - cp ../../sdl-config `which sdl-config` -} - -TEST() -{ - cd libsdl-1.2-hg/test - ./configure - make - echo testvidoinfo - testvidinfo - echo testgl - testgl - echo testwm - testwm - echo testhread - testhread - echo testsprite - testsprite - echo testdyngl - testdyngl - echo testoverlay - testoverlay - echo testoverlay2 - testoverlay2 - echo threadwin - threadwin - echo testalpha - testalpha - echo testiconv - testiconv - echo testtimer - testtimer - echo graywin - graywin - echo testerror - testerror - echo torturethread - torturethread - echo testbitmap - testbitmap - echo testjoystick - testjoystick - echo testver - testver - echo testfile - testfile - echo testpalette - testpalette - echo loopwave - loopwave - echo testblitspeed - testblitspeed - echo testkeys - testkeys - echo testcursor - testcursor - echo checkkeys - checkkeys - echo testgamma - testgamma - echo testplatform - testplatform - echo testcdrom - testcdrom - echo testloadso - testloadso - echo testwim - testwin - echo testsem - testsem - echo testlock - testlock -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2010 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.3_gsoc.recipe b/media-libs/libsdl/libsdl-1.3_gsoc.recipe deleted file mode 100644 index 1ae926ca8..000000000 --- a/media-libs/libsdl/libsdl-1.3_gsoc.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="hg+http://bitbucket.org/antifinidictor/haiku-sdl-1.3" -#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" -REVISION="1" -STATUS_HAIKU="broken" -MESSAGE="This is a work in progress and not ready for release." -DEPEND="" -BUILD() -{ - cd libsdl-1.3-gsoc - ./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 libsdl-1.3-gsoc - make install -} - -TEST() -{ - cd libsdl-1.3-gsoc/test - ./autogen - ./configure - make -} - -LICENSE="Zlib" -COPYRIGHT="1997-2011 Sam Lantinga" diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe deleted file mode 100644 index 670953ed7..000000000 --- a/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="Simple Direct Layer Mixer Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" -SRC_URI="hg+http://hg.libsdl.org/SDL_mixer/#SDL-1.2" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="libsdl >= 1.2.14 - media-libs/flac >= 1.2.1 - media-libs/libmad >= 0.15.1 - media-libs/libvorbis >= 1.3.1 - media-libs/libmikmod >= 3.1.11 - media-libs/libogg >= 1.2.0 - media-libs/smpeg >= 0.4.5" - -BUILD() -{ - cd sdl-mixer-1.2-hg - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-music-midi - make -} - -INSTALL() -{ - cd sdl-mixer-1.2-hg - make install -} - -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga"