diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-26 08:12:12 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-26 08:12:12 +0000 |
commit | aeb6b8f3dfc391ee0fe73b4fd11c76e60b7b129a (patch) | |
tree | a00e1adc6aba2e0b7654fc3f3e56846dce10c028 | |
parent | Fix pulseaudio module wrt #329737 by Reuben Martin. Remove -O20 from upstream... (diff) | |
download | gentoo-2-aeb6b8f3dfc391ee0fe73b4fd11c76e60b7b129a.tar.gz gentoo-2-aeb6b8f3dfc391ee0fe73b4fd11c76e60b7b129a.tar.bz2 gentoo-2-aeb6b8f3dfc391ee0fe73b4fd11c76e60b7b129a.zip |
punt panda3d
-rw-r--r-- | media-libs/panda3d/ChangeLog | 52 | ||||
-rw-r--r-- | media-libs/panda3d/Manifest | 10 | ||||
-rw-r--r-- | media-libs/panda3d/files/50panda3d | 6 | ||||
-rw-r--r-- | media-libs/panda3d/files/panda3d-1.0.4-makepanda.patch | 170 | ||||
-rw-r--r-- | media-libs/panda3d/files/panda3d-1.0.5-makepanda.patch | 170 | ||||
-rw-r--r-- | media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch | 92 | ||||
-rw-r--r-- | media-libs/panda3d/metadata.xml | 15 | ||||
-rw-r--r-- | media-libs/panda3d/panda3d-1.0.5.ebuild | 115 | ||||
-rw-r--r-- | media-libs/panda3d/panda3d-1.5.2.ebuild | 121 |
9 files changed, 0 insertions, 751 deletions
diff --git a/media-libs/panda3d/ChangeLog b/media-libs/panda3d/ChangeLog deleted file mode 100644 index 5c2bce06f8fc..000000000000 --- a/media-libs/panda3d/ChangeLog +++ /dev/null @@ -1,52 +0,0 @@ -# ChangeLog for media-libs/panda3d -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/ChangeLog,v 1.12 2010/05/31 15:12:59 arfrever Exp $ - - 31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - panda3d-1.0.5.ebuild, panda3d-1.5.2.ebuild: - Delete calls to deprecated python_version(). - - 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> - files/panda3d-1.0.4-makepanda.patch: - Fix patch with absolute paths. - - 08 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> panda3d-1.5.2.ebuild: - Add opengl to dependencies (needed otherwise -lGL is not found). - - 30 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml: - add to graphics herd - -*panda3d-1.5.2 (30 Aug 2008) - - 30 Aug 2008; Markus Meier <maekke@gentoo.org> - +files/panda3d-1.5.2-gcc43.patch, -panda3d-1.0.4.ebuild, - +panda3d-1.5.2.ebuild: - version bump, bug #144259; old - - 17 Oct 2007; Samuli Suominen <drac@gentoo.org> panda3d-1.0.5.ebuild: - Change media-libs/fmod dep to work with slots. - - 14 Jul 2007; Christian Heim <phreak@gentoo.org> metadata.xml: - Assigning media-libs/panda3d to m-needed, as chriswhite has been retired - (#56211). - - 30 Apr 2007; Marius Mauch <genone@gentoo.org> panda3d-1.0.4.ebuild, - panda3d-1.0.5.ebuild: - Replacing einfo with elog - - 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: - Regenerate digest in Manifest2 format. - - 07 Jul 2005; Chris White <chriswhite@gentoo.org> panda3d-1.0.4.ebuild: - fixed use flag warning, freetype to truetype - - 24 Jun 2005; Chris White <chriswhite@gentoo.org> : - Recommiting manifest with non-alpha gnupg. - -*panda3d-1.0.4 (24 Jun 2005) - - 24 Jun 2005; Chris White <chriswhite@gentoo.org> +files/50panda3d, - +files/panda3d-1.0.4-makepanda.patch, +metadata.xml, - +panda3d-1.0.4.ebuild: - Initial import into the tree. This closes bug #95995. - diff --git a/media-libs/panda3d/Manifest b/media-libs/panda3d/Manifest deleted file mode 100644 index 608ea77340fa..000000000000 --- a/media-libs/panda3d/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX 50panda3d 216 RMD160 64675273e3050426bbb8a9b006abe2cf32488396 SHA1 554e2254b0075c31102135697a09547ad7953059 SHA256 d011a36602fecb6d70dbced4ce2130f7446e415b84de8fe29b187494517aab87 -AUX panda3d-1.0.4-makepanda.patch 8774 RMD160 79639b4949e7ddb9cbed85b6177493686401f690 SHA1 54ef289f5f892dd0bd055181f038effeb05f178b SHA256 18d3f9e8a071911c236c45c38c51ad2f405592ddb2c483baee792c5d3caa6aaf -AUX panda3d-1.0.5-makepanda.patch 8711 RMD160 de9089c67ce36f9df4af913cf8819119f8ec01cd SHA1 ec3d215e5b5344430949ae886da582fff4a7c25f SHA256 144ce6639ab90d00eaa77de8326f6d73d617d87ce8263ba403bec6ca8af38c4d -AUX panda3d-1.5.2-gcc43.patch 4130 RMD160 3c127f2405d06bfbaff8f3b264a7e63bc01438d6 SHA1 0734cbebd726f14d7e693ee0b9a2ddb5902f9a1d SHA256 89b4ebfad7024feb6a87745deef0f6038de1c870afe205db76311d68d1c767e4 -DIST panda3d-1.0.5.tar.gz 28996142 RMD160 70a1298432ae923002d183aab0bc9f806f90d704 SHA1 6fe232ad716467b780aace0f2894d53ef03d4297 SHA256 8c31070bd253771e5fd9a2c7e66279456dc5c4bc3130afd5def3db59b0173097 -DIST panda3d-1.5.2.tar.gz 41250324 RMD160 c91ef4530280bfc0c4c62489bd769e99f2d7db34 SHA1 762fa61b6761b48bc3c0172b088a867a7740ddff SHA256 069f4515b8794829a435c1890a0a74c16d0bc9246ce90104d053cd3f11d9b55b -EBUILD panda3d-1.0.5.ebuild 2615 RMD160 e463722fee402cf6a3105832e8467ee42640c34e SHA1 318c4e0ab79b3bcf92c92693a1f1e131c697eca5 SHA256 91b3075ad7022945fa3a24ea1adf1c8199bf33ee2118730a2fdfabcde1f7f8f9 -EBUILD panda3d-1.5.2.ebuild 2820 RMD160 885a8e3a116f7db4cea4fcb4ec456d78af6cc8b8 SHA1 0f2fa99eebdee9afe0c2920a825e9795693360a2 SHA256 029b23848d25bdb573dc949419b8ce1ee80f8ddc91ffb206261ad66a817bd80a -MISC ChangeLog 1892 RMD160 9e0011121570a2b07ed6c1c13bf46435f1927e65 SHA1 d1720da939356e9b161f3761c085a47dc203b23d SHA256 482ff4afafa632bbd6b27a465d552a0e0c909616a19187eefbeda4dc9ee401a2 -MISC metadata.xml 735 RMD160 e4ca2499eaea1608dffba7b424295648771b546e SHA1 38f351f2e7ce782dd99710cf0cf0a96341fb7bb4 SHA256 22f5c5138229a8a92d99084e6c2cf789036d14853440f41c230c93eedd8f0229 diff --git a/media-libs/panda3d/files/50panda3d b/media-libs/panda3d/files/50panda3d deleted file mode 100644 index aaad025fbc12..000000000000 --- a/media-libs/panda3d/files/50panda3d +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/env.d/50panda3d: -# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/files/50panda3d,v 1.1 2005/06/24 05:28:52 chriswhite Exp $ - -PATH="/opt/panda3d/bin" -ROOTPATH="/opt/panda3d/bin" -LDPATH="/opt/panda3d/lib" diff --git a/media-libs/panda3d/files/panda3d-1.0.4-makepanda.patch b/media-libs/panda3d/files/panda3d-1.0.4-makepanda.patch deleted file mode 100644 index e71f02bcae14..000000000000 --- a/media-libs/panda3d/files/panda3d-1.0.4-makepanda.patch +++ /dev/null @@ -1,170 +0,0 @@ ---- a/makepanda/makepanda.py 2005-05-15 03:17:57.000000000 +0900 -+++ b/makepanda/makepanda.py 2005-06-24 14:03:21.000000000 +0900 -@@ -179,6 +179,7 @@ - if (sys.platform == "win32"): COMPILERS=["MSVC7"] - if (sys.platform == "linux2"): COMPILERS=["LINUXA"] - PREFIX="built" -+LIBDIR="lib" - COMPILER=COMPILERS[0] - OPTIMIZE="3" - INSTALLER=0 -@@ -452,6 +453,7 @@ - print " --help (print the help message you're reading now)" - print " --package-info (help info about the optional packages)" - print " --prefix X (install into prefix dir, default \"built\")" -+ print " --libdir X (install libs into libdir, default \"lib\")" - print " --compiler X (currently, compiler can only be MSVC7,LINUXA)" - print " --optimize X (optimization level can be 1,2,3,4)" - print " --thirdparty X (directory containing third-party software)" -@@ -482,7 +484,7 @@ - global PREFIX,COMPILER,OPTIMIZE,OMIT,THIRDPARTY,INSTALLER,GENMAN - global PPGAME,COPYEXTRAS,VERSION,COMPRESSOR,DIRECTXSDK,VERBOSE - longopts = [ -- "help","package-info","prefix=","compiler=","directx-sdk=","thirdparty=", -+ "help","package-info","prefix=","libdir=","compiler=","directx-sdk=","thirdparty=", - "optimize=","everything","nothing","installer","ppgame=","quiet","verbose", - "version=","lzma"] - anything = 0 -@@ -494,6 +496,7 @@ - if (option=="--help"): raise "usage" - elif (option=="--package-info"): raise "package-info" - elif (option=="--prefix"): PREFIX=value -+ elif (option=="--libdir"): LIBDIR=value - elif (option=="--compiler"): COMPILER=value - elif (option=="--directx-sdk"): DIRECTXSDK=value - elif (option=="--thirdparty"): THIRDPARTY=value -@@ -522,7 +525,8 @@ - except "package-info": packageInfo() - except: usage(0) - if (anything==0): usage(0) -- if (OPTIMIZE=="1"): OPTIMIZE=1 -+ if (OPTIMIZE=="0"): OPTIMIZE=0 -+ elif (OPTIMIZE=="1"): OPTIMIZE=1 - elif (OPTIMIZE=="2"): OPTIMIZE=2 - elif (OPTIMIZE=="3"): OPTIMIZE=3 - elif (OPTIMIZE=="4"): OPTIMIZE=4 -@@ -784,7 +788,7 @@ - ########################################################################################## - - if (sys.platform != "win32"): -- BUILTLIB = os.path.abspath(PREFIX+"/lib") -+ BUILTLIB = os.path.abspath(PREFIX+"/"+LIBDIR) - try: - LDPATH = [] - f = file("/etc/ld.so.conf","r") -@@ -794,7 +798,7 @@ - if (os.environ.has_key("LD_LIBRARY_PATH")): - LDPATH = LDPATH + os.environ["LD_LIBRARY_PATH"].split(":") - if (LDPATH.count(BUILTLIB)==0): -- WARNINGS.append("Caution: the "+PREFIX+"/lib directory is not in LD_LIBRARY_PATH") -+ WARNINGS.append("Caution: the "+PREFIX+"/"+LIBDIR+" directory is not in LD_LIBRARY_PATH") - WARNINGS.append("or /etc/ld.so.conf. You must add it before using panda.") - if (os.environ.has_key("LD_LIBRARY_PATH")): - os.environ["LD_LIBRARY_PATH"] = BUILTLIB + ":" + os.environ["LD_LIBRARY_PATH"] -@@ -819,6 +823,7 @@ - if (OMIT.count(x)==0): tkeep = tkeep + x + " " - else: tomit = tomit + x + " " - print "Makepanda: Prefix Directory:",PREFIX -+ print "Makepanda: Lib Directory:",PREFIX+"/"+LIBDIR - print "Makepanda: Compiler:",COMPILER - print "Makepanda: Optimize:",OPTIMIZE - print "Makepanda: Keep Pkg:",tkeep -@@ -850,7 +855,10 @@ - - MakeDirectory(PREFIX) - MakeDirectory(PREFIX+"/bin") --MakeDirectory(PREFIX+"/lib") -+if (sys.platform == "win32"): -+ MakeDirectory(PREFIX+"/lib") -+else: -+ MakeDirectory(PREFIX+"/"+LIBDIR) - MakeDirectory(PREFIX+"/etc") - MakeDirectory(PREFIX+"/plugins") - MakeDirectory(PREFIX+"/pandac") -@@ -1205,17 +1213,26 @@ - if (older(wobj, dep)): - if VERBOSE >= 0: - checkIfNewDir(ipath[1]) -- if (src[-2:]==".c"): cmd = 'gcc -c -o ' + wobj -- else: cmd = 'g++ -ftemplate-depth-30 -c -o ' + wobj -+ if (src[-2:]==".c"): -+ if os.environ.has_key("CFLAGS"): -+ cmd = 'gcc ' + os.environ["CFLAGS"] + ' -c -o ' + wobj -+ else: -+ cmd = 'gcc -c -o ' + wobj -+ else: -+ if os.environ.has_key("CXXFLAGS"): -+ cmd = 'g++ ' + os.environ["CXXFLAGS"] + ' -c -o ' + wobj -+ else: -+ cmd = 'g++ -ftemplate-depth-30 -c -o ' + wobj - cmd = cmd + ' -I"' + PythonSDK + '"' - if (PkgSelected(opts,"VRPN")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/vrpn/include' - if (PkgSelected(opts,"FFTW")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/fftw/include' -- if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/fmod/include' -+ if (PkgSelected(opts,"FMOD")): pass - if (PkgSelected(opts,"NVIDIACG")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/nvidiacg/include' -- if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/nspr/include' -+ if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -I/usr/include/nspr' - if (PkgSelected(opts,"FREETYPE")): cmd = cmd + ' -I/usr/include/freetype2' - for x in ipath: cmd = cmd + ' -I' + x - if (opts.count("WITHINPANDA")): cmd = cmd + ' -DWITHIN_PANDA' -+ if (OPTIMIZE==0): pass - if (OPTIMIZE==1): cmd = cmd + " -g" - if (OPTIMIZE==2): cmd = cmd + " -O1" - if (OPTIMIZE==3): cmd = cmd + " -O2" -@@ -1366,7 +1383,7 @@ - - if (COMPILER=="LINUXA"): - if (lib[-4:]==".ilb"): wlib = PREFIX+"/tmp/" + lib[:-4] + ".a" -- else: wlib = PREFIX+"/lib/" + lib[:-4] + ".a" -+ else: wlib = PREFIX+"/"+ LIBDIR + "/" + lib[:-4] + ".a" - wobj = [] - for x in obj: wobj.append(PREFIX + "/tmp/" + x[:-4] + ".o") - if (older(wlib, wobj)): -@@ -1488,15 +1505,15 @@ - CopyFile(dll[:-4]+"_d.dll", dll) - - if (COMPILER=="LINUXA"): -- ALLTARGETS.append(PREFIX+"/lib/"+dll[:-4]+".so") -+ ALLTARGETS.append(PREFIX+"/"+LIBDIR+dll[:-4]+".so") - if (dll[-4:]==".exe"): wdll = PREFIX+"/bin/"+dll[:-4] -- else: wdll = PREFIX+"/lib/"+dll[:-4]+".so" -+ else: wdll = PREFIX+"/"+LIBDIR+"/"+dll[:-4]+".so" - wobj = [] - for x in obj: - suffix = x[-4:] - if (suffix==".obj"): wobj.append(PREFIX+"/tmp/"+x[:-4]+".o") -- elif (suffix==".dll"): wobj.append(PREFIX+"/lib/"+x[:-4]+".so") -- elif (suffix==".lib"): wobj.append(PREFIX+"/lib/"+x[:-4]+".a") -+ elif (suffix==".dll"): wobj.append(PREFIX+"/"+LIBDIR+"/"+x[:-4]+".so") -+ elif (suffix==".lib"): wobj.append(PREFIX+"/"+LIBDIR+"/"+x[:-4]+".a") - elif (suffix==".ilb"): wobj.append(PREFIX+"/tmp/"+x[:-4]+".a") - else: sys.exit("unknown suffix in object list.") - if (older(wdll, wobj+xdep)): -@@ -1506,14 +1523,14 @@ - suffix = x[-4:] - if (suffix==".obj"): cmd = cmd + ' ' + PREFIX + '/tmp/' + x[:-4] + '.o' - elif (suffix==".dll"): cmd = cmd + ' -l' + x[3:-4] -- elif (suffix==".lib"): cmd = cmd + ' ' + PREFIX + '/lib/' + x[:-4] + '.a' -+ elif (suffix==".lib"): cmd = cmd + ' ' + PREFIX + '/'+ LIBDIR + "/" + x[:-4] + '.a' - elif (suffix==".ilb"): cmd = cmd + ' ' + PREFIX + '/tmp/' + x[:-4] + '.a' -- if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -L' + THIRDPARTY + '/linux-libs-a/fmod/lib -lfmod-3.74' -+ if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -lfmod' - if (PkgSelected(opts,"NVIDIACG")): - cmd = cmd + ' -L' + THIRDPARTY + 'nvidiacg/lib ' - if (opts.count("CGGL")): cmd = cmd + " -lCgGL" - cmd = cmd + " -lCg" -- if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -L' + THIRDPARTY + '/linux-libs-a/nspr/lib -lpandanspr4' -+ if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -L/usr/' + LIBDIR + '/nspr -lnspr4' - if (PkgSelected(opts,"ZLIB")): cmd = cmd + " -lz" - if (PkgSelected(opts,"PNG")): cmd = cmd + " -lpng" - if (PkgSelected(opts,"JPEG")): cmd = cmd + " -ljpeg" -@@ -1891,7 +1908,7 @@ - CopyAllFiles(PREFIX+"/bin/",THIRDPARTY+"/win-libs-vc7/"+pkg.lower()+"/bin/") - if (COMPILER == "LINUXA"): - if (os.path.exists(THIRDPARTY+"/linux-libs-a/"+pkg.lower()+"/lib")): -- CopyAllFiles(PREFIX+"/lib/",THIRDPARTY+"/linux-libs-a/"+pkg.lower()+"/lib/") -+ CopyAllFiles(PREFIX+"/"+LIBDIR,THIRDPARTY+"/linux-libs-a/"+pkg.lower()+"/"+LIBDIR) - - if (sys.platform == "win32"): - CopyTree(PREFIX+'/python', 'thirdparty/win-python') diff --git a/media-libs/panda3d/files/panda3d-1.0.5-makepanda.patch b/media-libs/panda3d/files/panda3d-1.0.5-makepanda.patch deleted file mode 100644 index 9c01f178ba63..000000000000 --- a/media-libs/panda3d/files/panda3d-1.0.5-makepanda.patch +++ /dev/null @@ -1,170 +0,0 @@ ---- makepanda/makepanda.py.old 2005-10-04 13:55:15.000000000 +0900 -+++ makepanda/makepanda.py 2005-10-04 14:07:34.000000000 +0900 -@@ -192,6 +192,7 @@ - if (sys.platform == "win32"): COMPILERS=["MSVC7"] - if (sys.platform == "linux2"): COMPILERS=["LINUXA"] - PREFIX="built" -+LIBDIR="lib" - COMPILER=COMPILERS[0] - OPTIMIZE="3" - INSTALLER=0 -@@ -473,6 +474,7 @@ - print " --help (print the help message you're reading now)" - print " --package-info (help info about the optional packages)" - print " --prefix X (install into prefix dir, default \"built\")" -+ print " --libdir X (install libs into libdir, default \"lib\")" - print " --compiler X (currently, compiler can only be MSVC7,LINUXA)" - print " --optimize X (optimization level can be 1,2,3,4)" - print " --thirdparty X (directory containing third-party software)" -@@ -500,10 +502,10 @@ - sys.exit(1) - - def parseopts(args): -- global PREFIX,COMPILER,OPTIMIZE,OMIT,THIRDPARTY,INSTALLER,GENMAN -+ global PREFIX,LIBDIR,COMPILER,OPTIMIZE,OMIT,THIRDPARTY,INSTALLER,GENMAN - global PPGAME,COPYEXTRAS,VERSION,COMPRESSOR,DIRECTXSDK,VERBOSE - longopts = [ -- "help","package-info","prefix=","compiler=","directx-sdk=","thirdparty=", -+ "help","package-info","prefix=","libdir=","compiler=","directx-sdk=","thirdparty=", - "optimize=","everything","nothing","installer","ppgame=","quiet","verbose", - "version=","lzma","no-python"] - anything = 0 -@@ -515,6 +517,7 @@ - if (option=="--help"): raise "usage" - elif (option=="--package-info"): raise "package-info" - elif (option=="--prefix"): PREFIX=value -+ elif (option=="--libdir"): LIBDIR=value - elif (option=="--compiler"): COMPILER=value - elif (option=="--directx-sdk"): DIRECTXSDK=value - elif (option=="--thirdparty"): THIRDPARTY=value -@@ -543,7 +546,8 @@ - except "package-info": packageInfo() - except: usage(0) - if (anything==0): usage(0) -- if (OPTIMIZE=="1"): OPTIMIZE=1 -+ if (OPTIMIZE=="0"): OPTIMIZE=0 -+ elif (OPTIMIZE=="1"): OPTIMIZE=1 - elif (OPTIMIZE=="2"): OPTIMIZE=2 - elif (OPTIMIZE=="3"): OPTIMIZE=3 - elif (OPTIMIZE=="4"): OPTIMIZE=4 -@@ -839,7 +843,7 @@ - ########################################################################################## - - if (sys.platform != "win32"): -- BUILTLIB = os.path.abspath(PREFIX+"/lib") -+ BUILTLIB = os.path.abspath(PREFIX+"/"+LIBDIR) - try: - LDPATH = [] - f = file("/etc/ld.so.conf","r") -@@ -849,7 +853,7 @@ - if (os.environ.has_key("LD_LIBRARY_PATH")): - LDPATH = LDPATH + os.environ["LD_LIBRARY_PATH"].split(":") - if (LDPATH.count(BUILTLIB)==0): -- WARNINGS.append("Caution: the "+PREFIX+"/lib directory is not in LD_LIBRARY_PATH") -+ WARNINGS.append("Caution: the "+PREFIX+"/"+LIBDIR+" directory is not in LD_LIBRARY_PATH") - WARNINGS.append("or /etc/ld.so.conf. You must add it before using panda.") - if (os.environ.has_key("LD_LIBRARY_PATH")): - os.environ["LD_LIBRARY_PATH"] = BUILTLIB + ":" + os.environ["LD_LIBRARY_PATH"] -@@ -874,6 +878,7 @@ - if (OMIT.count(x)==0): tkeep = tkeep + x + " " - else: tomit = tomit + x + " " - print "Makepanda: Prefix Directory:",PREFIX -+ print "Makepanda: Lib Directory:",PREFIX+"/"+LIBDIR - print "Makepanda: Compiler:",COMPILER - print "Makepanda: Optimize:",OPTIMIZE - print "Makepanda: Keep Pkg:",tkeep -@@ -905,6 +910,10 @@ - - MakeDirectory(PREFIX) - MakeDirectory(PREFIX+"/bin") -+if (sys.platform == "win32"): -+ MakeDirectory(PREFIX+"/lib") -+else: -+ MakeDirectory(PREFIX+"/"+LIBDIR) - MakeDirectory(PREFIX+"/lib") - MakeDirectory(PREFIX+"/etc") - MakeDirectory(PREFIX+"/plugins") -@@ -1260,17 +1269,26 @@ - if (older(wobj, dep)): - if VERBOSE >= 0: - checkIfNewDir(ipath[1]) -- if (src[-2:]==".c"): cmd = 'gcc -c -o ' + wobj -- else: cmd = 'g++ -ftemplate-depth-30 -c -o ' + wobj -+ if (src[-2:]==".c"): -+ if os.environ.has_key("CFLAGS"): -+ cmd = 'gcc ' + os.environ["CFLAGS"] + ' -c -o ' + wobj -+ else: -+ cmd = 'gcc -c -o ' + wobj -+ else: -+ if os.environ.has_key("CXXFLAGS"): -+ cmd = 'g++ ' + os.environ["CXXFLAGS"] + ' -c -o ' + wobj -+ else: -+ cmd = 'g++ -ftemplate-depth-30 -c -o ' + wobj - if (OMIT.count("PYTHON")==0): cmd = cmd + ' -I"' + PYTHONSDK + '"' - if (PkgSelected(opts,"VRPN")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/vrpn/include' - if (PkgSelected(opts,"FFTW")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/fftw/include' -- if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/fmod/include' -+ if (PkgSelected(opts,"FMOD")): pass - if (PkgSelected(opts,"NVIDIACG")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/nvidiacg/include' -- if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -I' + THIRDPARTY + '/linux-libs-a/nspr/include' -+ if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -I/usr/include/nspr' - if (PkgSelected(opts,"FREETYPE")): cmd = cmd + ' -I/usr/include/freetype2' - for x in ipath: cmd = cmd + ' -I' + x - if (opts.count("WITHINPANDA")): cmd = cmd + ' -DWITHIN_PANDA' -+ if (OPTIMIZE==0): pass - if (OPTIMIZE==1): cmd = cmd + " -g" - if (OPTIMIZE==2): cmd = cmd + " -O1" - if (OPTIMIZE==3): cmd = cmd + " -O2" -@@ -1390,7 +1408,7 @@ - - if (COMPILER=="MSVC7"): - if (lib[-4:]==".ilb"): wlib = PREFIX+"/tmp/" + lib[:-4] + ".lib" -- else: wlib = PREFIX+"/lib/" + lib[:-4] + ".lib" -+ else: wlib = PREFIX+"/"+LIBDIR+"/" + lib[:-4] + ".lib" - wobj = xpaths(PREFIX+"/tmp/",obj,"") - ALLTARGETS.append(wlib) - if (older(wlib, wobj)): -@@ -1523,14 +1541,14 @@ - - if (COMPILER=="LINUXA"): - if (dll[-4:]==".exe"): wdll = PREFIX+"/bin/"+dll[:-4] -- else: wdll = PREFIX+"/lib/"+dll[:-4]+".so" -+ else: wdll = PREFIX+"/"+LIBDIR+"/"+dll[:-4]+".so" - ALLTARGETS.append(wdll) - wobj = [] - for x in obj: - suffix = x[-4:] - if (suffix==".obj"): wobj.append(PREFIX+"/tmp/"+x[:-4]+".o") - elif (suffix==".dll"): wobj.append(PREFIX+"/lib/"+x[:-4]+".so") -- elif (suffix==".lib"): wobj.append(PREFIX+"/lib/"+x[:-4]+".a") -+ elif (suffix==".lib"): wobj.append(PREFIX+"/"+LIBDIR+"/"+x[:-4]+".a") - elif (suffix==".ilb"): wobj.append(PREFIX+"/tmp/"+x[:-4]+".a") - else: sys.exit("unknown suffix in object list.") - if (older(wdll, wobj+xdep)): -@@ -1540,14 +1558,14 @@ - suffix = x[-4:] - if (suffix==".obj"): cmd = cmd + ' ' + PREFIX + '/tmp/' + x[:-4] + '.o' - elif (suffix==".dll"): cmd = cmd + ' -l' + x[3:-4] -- elif (suffix==".lib"): cmd = cmd + ' ' + PREFIX + '/lib/' + x[:-4] + '.a' -+ elif (suffix==".lib"): cmd = cmd + ' ' + PREFIX + '/'+LIBDIR+'/' + x[:-4] + '.a' - elif (suffix==".ilb"): cmd = cmd + ' ' + PREFIX + '/tmp/' + x[:-4] + '.a' -- if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -L' + THIRDPARTY + '/linux-libs-a/fmod/lib -lfmod-3.74' -+ if (PkgSelected(opts,"FMOD")): cmd = cmd + ' -lfmod' - if (PkgSelected(opts,"NVIDIACG")): - cmd = cmd + ' -L' + THIRDPARTY + 'nvidiacg/lib ' - if (opts.count("CGGL")): cmd = cmd + " -lCgGL" - cmd = cmd + " -lCg" -- if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -L' + THIRDPARTY + '/linux-libs-a/nspr/lib -lpandanspr4' -+ if (PkgSelected(opts,"NSPR")): cmd = cmd + ' -L/usr/' + LIBDIR + '/nspr -lnspr4' - if (PkgSelected(opts,"ZLIB")): cmd = cmd + " -lz" - if (PkgSelected(opts,"PNG")): cmd = cmd + " -lpng" - if (PkgSelected(opts,"JPEG")): cmd = cmd + " -ljpeg" -@@ -1918,7 +1936,7 @@ - CopyAllFiles(PREFIX+"/bin/",THIRDPARTY+"/win-libs-vc7/"+pkg.lower()+"/bin/") - if (COMPILER == "LINUXA"): - if (os.path.exists(THIRDPARTY+"/linux-libs-a/"+pkg.lower()+"/lib")): -- CopyAllFiles(PREFIX+"/lib/",THIRDPARTY+"/linux-libs-a/"+pkg.lower()+"/lib/") -+ CopyAllFiles(PREFIX+"/"+LIBDIR+"/",THIRDPARTY+"/linux-libs-a/"+pkg.lower()+"/"+LIBDIR+"/") - - if (sys.platform == "win32"): - CopyFile(PREFIX+'/bin/', 'thirdparty/win-python/python22.dll') diff --git a/media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch b/media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch deleted file mode 100644 index df6404c246c0..000000000000 --- a/media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -ur panda3d-1.5.2.orig/dtool/src/dtoolbase/typeRegistryNode.cxx panda3d-1.5.2/dtool/src/dtoolbase/typeRegistryNode.cxx ---- panda3d-1.5.2.orig/dtool/src/dtoolbase/typeRegistryNode.cxx 2008-08-30 15:53:58.000000000 +0200 -+++ panda3d-1.5.2/dtool/src/dtoolbase/typeRegistryNode.cxx 2008-08-30 15:56:36.000000000 +0200 -@@ -19,6 +19,7 @@ - #include "typeRegistryNode.h" - - #include <algorithm> -+#include <string.h> - - bool TypeRegistryNode::_paranoid_inheritance = false; - -diff -ur panda3d-1.5.2.orig/dtool/src/dtoolutil/filename.I panda3d-1.5.2/dtool/src/dtoolutil/filename.I ---- panda3d-1.5.2.orig/dtool/src/dtoolutil/filename.I 2008-08-30 16:01:48.000000000 +0200 -+++ panda3d-1.5.2/dtool/src/dtoolutil/filename.I 2008-08-30 16:03:50.000000000 +0200 -@@ -16,6 +16,8 @@ - // - //////////////////////////////////////////////////////////////////// - -+#include <string.h> -+ - //////////////////////////////////////////////////////////////////// - // Function: Filename::Constructor - // Access: Published -diff -ur panda3d-1.5.2.orig/dtool/src/cppparser/cppExpression.cxx panda3d-1.5.2/dtool/src/cppparser/cppExpression.cxx ---- panda3d-1.5.2.orig/dtool/src/cppparser/cppExpression.cxx 2008-08-30 16:06:51.000000000 +0200 -+++ panda3d-1.5.2/dtool/src/cppparser/cppExpression.cxx 2008-08-30 16:08:14.000000000 +0200 -@@ -32,6 +32,7 @@ - #include "cppBison.h" - - #include <assert.h> -+#include <stdlib.h> - - //////////////////////////////////////////////////////////////////// - // Function: CPPExpresion::Result::Constructor -diff -ur panda3d-1.5.2.orig/dtool/src/cppparser/cppPreprocessor.cxx panda3d-1.5.2/dtool/src/cppparser/cppPreprocessor.cxx ---- panda3d-1.5.2.orig/dtool/src/cppparser/cppPreprocessor.cxx 2008-08-30 16:06:51.000000000 +0200 -+++ panda3d-1.5.2/dtool/src/cppparser/cppPreprocessor.cxx 2008-08-30 16:07:36.000000000 +0200 -@@ -32,6 +32,7 @@ - - #include <assert.h> - #include <ctype.h> -+#include <stdlib.h> - - // We manage our own visibility counter, in addition to that managed - // by cppBison.y. We do this just so we can define manifests with the -diff -ur panda3d-1.5.2.orig/dtool/src/prc/configDeclaration.cxx panda3d-1.5.2/dtool/src/prc/configDeclaration.cxx ---- panda3d-1.5.2.orig/dtool/src/prc/configDeclaration.cxx 2008-08-30 16:12:41.000000000 +0200 -+++ panda3d-1.5.2/dtool/src/prc/configDeclaration.cxx 2008-08-30 16:13:07.000000000 +0200 -@@ -19,6 +19,7 @@ - #include "configDeclaration.h" - #include "configVariableCore.h" - -+#include <stdlib.h> - - //////////////////////////////////////////////////////////////////// - // Function: ConfigDeclaration::Constructor -diff -ur panda3d-1.5.2.orig/dtool/src/interrogate/interrogate_module.cxx panda3d-1.5.2/dtool/src/interrogate/interrogate_module.cxx ---- panda3d-1.5.2.orig/dtool/src/interrogate/interrogate_module.cxx 2008-08-30 16:15:50.000000000 +0200 -+++ panda3d-1.5.2/dtool/src/interrogate/interrogate_module.cxx 2008-08-30 16:16:20.000000000 +0200 -@@ -29,6 +29,8 @@ - - #include "set" - -+#include <stdlib.h> -+ - // If our system getopt() doesn't come with getopt_long_only(), then use - // the GNU flavor that we've got in tool for this purpose. - #ifndef HAVE_GETOPT_LONG_ONLY -diff -ur panda3d-1.5.2.orig/panda/src/nativenet/socket_address.h panda3d-1.5.2/panda/src/nativenet/socket_address.h ---- panda3d-1.5.2.orig/panda/src/nativenet/socket_address.h 2008-08-30 16:27:03.000000000 +0200 -+++ panda3d-1.5.2/panda/src/nativenet/socket_address.h 2008-08-30 16:28:49.000000000 +0200 -@@ -5,6 +5,8 @@ - #include "numeric_types.h" - #include "socket_portable.h" - -+#include <stdlib.h> -+ - /////////////////////////////////// - // Class : Socket_Address - // -diff -ur panda3d-1.5.2.orig/panda/src/pnmimagetypes/pnmFileTypePNM.cxx panda3d-1.5.2/panda/src/pnmimagetypes/pnmFileTypePNM.cxx ---- panda3d-1.5.2.orig/panda/src/pnmimagetypes/pnmFileTypePNM.cxx 2008-08-30 16:56:33.000000000 +0200 -+++ panda3d-1.5.2/panda/src/pnmimagetypes/pnmFileTypePNM.cxx 2008-08-30 16:57:53.000000000 +0200 -@@ -22,6 +22,8 @@ - #include "pnmFileTypeRegistry.h" - #include "bamReader.h" - -+#include <limits.h> -+ - static const char * const extensions_PNM[] = { - "pbm", "pgm", "ppm", "pnm" - }; diff --git a/media-libs/panda3d/metadata.xml b/media-libs/panda3d/metadata.xml deleted file mode 100644 index ff6a90f8f902..000000000000 --- a/media-libs/panda3d/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>graphics</herd> - <longdescription lang="en"> - Panda3D is a 3D engine: a library of subroutines for 3D rendering and game - development. The library is C++ with a set of Python bindings. Game development - with Panda3D usually consists of writing a Python program that controls the the - Panda3D library. - </longdescription> - <use> - <flag name="fmod">Enables support for using mod files for audio support</flag> - <flag name="nspr">Enables support for the Netscape Portable Runtime, used in network interface functionality (ie. multiplayer online game networking).</flag> - </use> -</pkgmetadata> diff --git a/media-libs/panda3d/panda3d-1.0.5.ebuild b/media-libs/panda3d/panda3d-1.0.5.ebuild deleted file mode 100644 index dc0d8050b188..000000000000 --- a/media-libs/panda3d/panda3d-1.0.5.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/panda3d-1.0.5.ebuild,v 1.6 2010/05/31 15:12:59 arfrever Exp $ - -inherit eutils python - -DESCRIPTION="A 3D framework in C++ with python bindings" -HOMEPAGE="http://panda3d.org" -SRC_URI="http://panda3d.org/download/${P}.tar.gz" - -LICENSE="Panda3D" -SLOT="0" -KEYWORDS="~x86" -IUSE="png jpeg tiff fmod nspr python ssl truetype doc zlib" - -DEPEND="doc? ( dev-python/epydoc ) - png? ( media-libs/libpng ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) - nspr? ( >=dev-libs/nspr-4.4.1-r2 ) - fmod? ( =media-libs/fmod-3* ) - ssl? ( dev-libs/openssl ) - truetype? ( media-libs/freetype ) - zlib? ( sys-libs/zlib ) - python? ( dev-lang/python )" - -use_no() -{ - local UWORD="$2" - if [ -z "${UWORD}" ]; then - UWORD="$1" - fi - - if useq $1 ; then - echo "--use-${UWORD}" - else - echo "--no-${UWORD}" - fi -} - -pkg_setup() { - ewarn "Please note that python bindings are now" - ewarn "set by the python USE flag to coordinate" - ewarn "with upstream." -} - -src_unpack() -{ - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-makepanda.patch -} - -src_compile() -{ - ./makepanda/makepanda.py \ - --compiler LINUXA \ - --prefix built \ - --libdir $(get_libdir) \ - $(use_no python) \ - $(use_no png) $(use_no jpeg) \ - $(use_no tiff) $(use_no fmod) \ - $(use_no ssl) $(use_no truetype freetype) \ - $(use_no zlib) $(use_no nspr) \ - || die "build failed" -} - -src_install() -{ - dodir /opt/panda3d - - doenvd ${FILESDIR}/50panda3d - sed -i -e "s:lib:$(get_libdir):g" \ - ${D}/etc/env.d/50panda3d \ - || die "libdir patching failed" - - if use doc; then - cp -R ${S}/samples ${S}/built - cd ${S}/built - epydoc --html direct - fi - - if use python ; then - # python installation - dodir $(python_get_sitedir) - cat <<- EOF > ${D}$(python_get_sitedir)/panda3d.pth - # This document sets up paths for python to access the - # panda3d modules - /opt/panda3d/built - /opt/panda3d/built/$(get_libdir) - EOF - fi - - cp -R ${S}/built/* ${D}/opt/panda3d - use python && touch ${D}/opt/panda3d/built/__init__.py -} - -pkg_postinst() -{ - elog "Panda3d is installed in /opt/panda3d" - elog - if use doc ; then - elog "Documentation is avaliable in /opt/panda3d/html" - elog "Samples are avalaible in /opt/panda3d/samples" - fi - elog "For C++ compiling, include directory must be set:" - elog "g++ -I/opt/panda3d/include [other flags]" - if use python ; then - elog - elog "ppython is depricated and panda3d modules are" - elog "now installed as standard python modules." - fi - elog - elog "Tutorials avaliable at http://panda3d.org" -} diff --git a/media-libs/panda3d/panda3d-1.5.2.ebuild b/media-libs/panda3d/panda3d-1.5.2.ebuild deleted file mode 100644 index b95b4aee6819..000000000000 --- a/media-libs/panda3d/panda3d-1.5.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/panda3d-1.5.2.ebuild,v 1.3 2010/05/31 15:12:59 arfrever Exp $ - -inherit eutils python - -DESCRIPTION="A 3D framework in C++ with python bindings" -HOMEPAGE="http://panda3d.org" -SRC_URI="http://panda3d.org/download/${P}/${P}.tar.gz" - -LICENSE="Panda3D" -SLOT="0" -KEYWORDS="~x86" -IUSE="doc ffmpeg fftw fmod jpeg openal png python ssl tiff truetype zlib" - -DEPEND="doc? ( dev-python/epydoc ) - ffmpeg? ( media-video/ffmpeg ) - fftw? ( sci-libs/fftw ) - fmod? ( =media-libs/fmod-3* ) - jpeg? ( media-libs/jpeg ) - openal? ( media-libs/openal ) - png? ( media-libs/libpng ) - python? ( dev-lang/python ) - ssl? ( dev-libs/openssl ) - tiff? ( media-libs/tiff ) - truetype? ( media-libs/freetype ) - zlib? ( sys-libs/zlib ) - virtual/opengl" - -use_no() { - local UWORD="$2" - if [ -z "${UWORD}" ]; then - UWORD="$1" - fi - - if useq $1 ; then - echo "--use-${UWORD}" - else - echo "--no-${UWORD}" - fi -} - -pkg_setup() { - ewarn "Please note that python bindings are now" - ewarn "set by the python USE flag to coordinate" - ewarn "with upstream." -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gcc43.patch -} - -src_compile() { - ./makepanda/makepanda.py \ - $(use_no ffmpeg) \ - $(use_no fftw) \ - $(use_no fmod) \ - $(use_no jpeg) \ - $(use_no png) \ - $(use_no openal) \ - $(use_no python) \ - $(use_no ssl openssl) \ - $(use_no tiff) \ - $(use_no truetype freetype) \ - $(use_no zlib) \ - || die "build failed" -} - -src_install() { - dodir /opt/panda3d - - doenvd "${FILESDIR}"/50panda3d - sed -i -e "s:lib:$(get_libdir):g" \ - "${D}"/etc/env.d/50panda3d \ - || die "libdir patching failed" - - if use doc; then - cp -R "${S}"/samples "${S}"/built - cp -R "${S}"/direct/src "${S}"/built/direct/src - cd "${S}"/built - fi - - if use python ; then - # python installation - dodir $(python_get_sitedir) - cat <<- EOF > "${D}"$(python_get_sitedir)/panda3d.pth - # This document sets up paths for python to access the - # panda3d modules - /opt/panda3d - /opt/panda3d/lib - /opt/panda3d/direct - /opt/panda3d/pandac - /opt/panda3d/built - /opt/panda3d/built/$(get_libdir) - EOF - fi - - cp -R "${S}"/direct/src "${S}"/built/direct/ - cp -R "${S}"/built/* "${D}"/opt/panda3d -} - -pkg_postinst() -{ - elog "Panda3d is installed in /opt/panda3d" - elog - if use doc ; then - elog "Documentation is avaliable in /opt/panda3d/doc" - elog "Samples are avalaible in /opt/panda3d/samples" - fi - elog "For C++ compiling, include directory must be set:" - elog "g++ -I/opt/panda3d/include [other flags]" - if use python ; then - elog - elog "ppython is depricated and panda3d modules are" - elog "now installed as standard python modules." - fi - elog - elog "Tutorials avaliable at http://panda3d.org" -} |