Add working jahshaka, gcc4 patch from bugzilla

7 files changed, 321 insertions, 0 deletions

diff --git a/media-video/jahshaka/Manifest b/media-video/jahshaka/Manifest
new file mode 100644
index 0000000..b902ea2
--- /dev/null
+++ b/media-video/jahshaka/Manifest
@@ -0,0 +1,24 @@
+AUX FT_Open_Flags.patch 489 RMD160 a78b392b2b16a2c4f7b5d1a4fbdd40b07972d518 SHA1 3111489dd67f9aed791c7115f8c122e6eb2a42ea SHA256 fd617a48d7ffbdca911ec68822459a44036d246785f8d299674f24fe5032a797
+MD5 eccbf141ba80b57f8127d38e4fcda2ec files/FT_Open_Flags.patch 489
+RMD160 a78b392b2b16a2c4f7b5d1a4fbdd40b07972d518 files/FT_Open_Flags.patch 489
+SHA256 fd617a48d7ffbdca911ec68822459a44036d246785f8d299674f24fe5032a797 files/FT_Open_Flags.patch 489
+AUX configure 549 RMD160 c1d76dbaecf5e2617ff06b84b0e59eb907d21be5 SHA1 c29d78a1ee4a562be183317882352e7de41d1090 SHA256 0bac41f5489c8c00e45082ff14c477db7cbbc746d4a58b0df17d0dc568c57c48
+MD5 d6a0064257b0ac77fa6c2db28ac89f90 files/configure 549
+RMD160 c1d76dbaecf5e2617ff06b84b0e59eb907d21be5 files/configure 549
+SHA256 0bac41f5489c8c00e45082ff14c477db7cbbc746d4a58b0df17d0dc568c57c48 files/configure 549
+AUX ftgl.h.patch 793 RMD160 142ae4a42c3b92363276907eed0c58aa32f77c41 SHA1 3715bca54b52662462cf7cba5962eb8e6679eb66 SHA256 01b5ed2353804d682661d07d72606b3d23c88cc0e48638e6d22e3bdbbdc753c7
+MD5 c3cb7840c08ef0ced53f6b8d58442449 files/ftgl.h.patch 793
+RMD160 142ae4a42c3b92363276907eed0c58aa32f77c41 files/ftgl.h.patch 793
+SHA256 01b5ed2353804d682661d07d72606b3d23c88cc0e48638e6d22e3bdbbdc753c7 files/ftgl.h.patch 793
+AUX jahshaka-2.0_rc1-gcc41.patch 7128 RMD160 23f4e6462618c9738ce8d30ba6d68d9ca75fb29d SHA1 c761c758ef11d8d6b154b68cac6cceeeea9efd88 SHA256 1ee1ab33c83e9f007a4f6c3dbc73039b0bfca097a3361a4b3c890e45ad891bfc
+MD5 6cee3feaf13fec1f270981d244b5941d files/jahshaka-2.0_rc1-gcc41.patch 7128
+RMD160 23f4e6462618c9738ce8d30ba6d68d9ca75fb29d files/jahshaka-2.0_rc1-gcc41.patch 7128
+SHA256 1ee1ab33c83e9f007a4f6c3dbc73039b0bfca097a3361a4b3c890e45ad891bfc files/jahshaka-2.0_rc1-gcc41.patch 7128
+DIST jahshaka_2.0_RC1.tar.gz 5966550 RMD160 1a7df04e7c51d5a97fd45ba535495fe6a66f0337 SHA1 8564fb054a663f513e72d5d9ef03fea04f09e8b3 SHA256 d8fba517bf82f91a813c441dfc326e4152ea991c02df68f84d29d428812e85cd
+EBUILD jahshaka-2.0_rc1.ebuild 1782 RMD160 1d10f96783d06e4f6b5de907773a01ce31cfcb91 SHA1 a7e1bc5924dee88e928ce74a4f42924eb3c4f8dd SHA256 a6f7e1fbce35adbffa9a43b4b7a147ccd79de3d7da904e37385478f3d838f01b
+MD5 a723573b3668cb2c615859670c3c0896 jahshaka-2.0_rc1.ebuild 1782
+RMD160 1d10f96783d06e4f6b5de907773a01ce31cfcb91 jahshaka-2.0_rc1.ebuild 1782
+SHA256 a6f7e1fbce35adbffa9a43b4b7a147ccd79de3d7da904e37385478f3d838f01b jahshaka-2.0_rc1.ebuild 1782
+MD5 100d9a11f4096086e95ae763f3f1e803 files/digest-jahshaka-2.0_rc1 253
+RMD160 d43a4222526b42f08df02ec88ff39872e89a9d47 files/digest-jahshaka-2.0_rc1 253
+SHA256 89e5fba252018c16bb7dc8637aef7b58949535857fe88b54aeeff3bc8a8723ff files/digest-jahshaka-2.0_rc1 253
diff --git a/media-video/jahshaka/files/FT_Open_Flags.patch b/media-video/jahshaka/files/FT_Open_Flags.patch
new file mode 100644
index 0000000..5ef25c6
--- /dev/null
+++ b/media-video/jahshaka/files/FT_Open_Flags.patch
@@ -0,0 +1,12 @@
+diff -Naur jahshaka/jah/objectlibs/FTGL/FTFace.cpp jahshaka.new/jah/objectlibs/FTGL/FTFace.cpp
+--- jahshaka/jah/objectlibs/FTGL/FTFace.cpp	2003-09-21 08:09:55.000000000 +0200
++++ jahshaka.new/jah/objectlibs/FTGL/FTFace.cpp	2004-06-26 08:59:58.229953432 +0200
+@@ -62,7 +62,7 @@
+ {
+     FT_Open_Args open;
+ 
+-    open.flags = (FT_Open_Flags)1; // FT_OPEN_MEMORY;
++    open.flags = FT_OPEN_MEMORY;
+     open.memory_base = (FT_Byte *)pBufferBytes;
+     open.memory_size = bufferSizeInBytes;
+ 
diff --git a/media-video/jahshaka/files/configure b/media-video/jahshaka/files/configure
new file mode 100644
index 0000000..b90d0b9
--- /dev/null
+++ b/media-video/jahshaka/files/configure
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+BUILDTYPE=$1
+CONFIGURED="false"
+
+echo Configuring for $BUILDTYPE
+
+case "$BUILDTYPE" in
+	"jahshaka")
+		echo build jahshaka
+		cp -vf jahshakaSettings.pro Settings.pro
+		${QTDIR}/bin/qmake jahshaka.pro
+		CONFIGURED="true"
+	;;
+	"jahplayer")
+		echo build jahplayer
+		cp -vf jahplayerSettings.pro Settings.pro
+		${QTDIR}/bin/qmake jahplayer.pro
+		CONFIGURED="true"
+	;;
+	* )
+		echo nothing entered or invalid entry
+		echo build jahshaka
+		cp -vf jahshakaSettings.pro Settings.pro
+		${QTDIR}/bin/qmake jahshaka.pro
+		CONFIGURED="true"
+	;;
+esac
diff --git a/media-video/jahshaka/files/digest-jahshaka-2.0_rc1 b/media-video/jahshaka/files/digest-jahshaka-2.0_rc1
new file mode 100644
index 0000000..f767311
--- /dev/null
+++ b/media-video/jahshaka/files/digest-jahshaka-2.0_rc1
@@ -0,0 +1,3 @@
+MD5 be4941253cf77b3dec30b324418e21df jahshaka_2.0_RC1.tar.gz 5966550
+RMD160 1a7df04e7c51d5a97fd45ba535495fe6a66f0337 jahshaka_2.0_RC1.tar.gz 5966550
+SHA256 d8fba517bf82f91a813c441dfc326e4152ea991c02df68f84d29d428812e85cd jahshaka_2.0_RC1.tar.gz 5966550
diff --git a/media-video/jahshaka/files/ftgl.h.patch b/media-video/jahshaka/files/ftgl.h.patch
new file mode 100644
index 0000000..540fa8b
--- /dev/null
+++ b/media-video/jahshaka/files/ftgl.h.patch
@@ -0,0 +1,24 @@
+*** jah/objectlibs/FTGL/FTGL.h  Sun Sep 21 08:13:01 2003
+--- jah/objectlibs/FTGL/FTGL.h.new      Fri Jan  9 10:17:29 2004
+***************
+*** 75,82 ****
+      #define GL_TEXTURE_PRIORITY_EXT           0x8066
+      #define GL_TEXTURE_RESIDENT_EXT           0x8067
+      #define GL_TEXTURE_1D_BINDING_EXT         0x8068
+-     #define GL_TEXTURE_2D_BINDING_EXT         0x8069
+      #define GL_TEXTURE_3D_BINDING_EXT         0x806A
+  #endif
+  
+  #endif  //  __FTGL__
+--- 75,83 ----
+      #define GL_TEXTURE_PRIORITY_EXT           0x8066
+      #define GL_TEXTURE_RESIDENT_EXT           0x8067
+      #define GL_TEXTURE_1D_BINDING_EXT         0x8068
+      #define GL_TEXTURE_3D_BINDING_EXT         0x806A
+  #endif
+  
++     #define GL_TEXTURE_2D_BINDING_EXT         0x8069
++ 
+  #endif  //  __FTGL__
+
+
diff --git a/media-video/jahshaka/files/jahshaka-2.0_rc1-gcc41.patch b/media-video/jahshaka/files/jahshaka-2.0_rc1-gcc41.patch
new file mode 100644
index 0000000..7757364
--- /dev/null
+++ b/media-video/jahshaka/files/jahshaka-2.0_rc1-gcc41.patch
@@ -0,0 +1,154 @@
+diff -rNud jahshaka-old/source/Jahshaka/JahCore/jahobjects/coreeffects.h jahshaka/source/Jahshaka/JahCore/jahobjects/coreeffects.h
+--- jahshaka-old/source/Jahshaka/JahCore/jahobjects/coreeffects.h	2006-08-15 21:07:56.000000000 +0300
++++ jahshaka/source/Jahshaka/JahCore/jahobjects/coreeffects.h	2006-08-15 21:12:36.000000000 +0300
+@@ -54,7 +54,7 @@
+ 		NOT_A_CATEGORY
+ 	};
+ 
+-    static std::string&  EffectInfo::getEffectCategoryName(EFFECT_CATEGORY category);
++    static std::string&  getEffectCategoryName(EFFECT_CATEGORY category);
+ 
+ 	// Should replace the FxCategory above
+ 	enum EFFECT_TYPE
+@@ -96,7 +96,7 @@
+ 		NOT_A_TYPE
+ 	};
+ 
+-    static std::string&  EffectInfo::getEffectTypeName(EFFECT_TYPE type);
++    static std::string&  getEffectTypeName(EFFECT_TYPE type);
+ 
+ protected:
+ 	EFFECT_TYPE			m_type;	
+diff -rNud jahshaka-old/source/Jahshaka/JahCore/jahobjects/coreobject.h jahshaka/source/Jahshaka/JahCore/jahobjects/coreobject.h
+--- jahshaka-old/source/Jahshaka/JahCore/jahobjects/coreobject.h	2006-08-15 21:34:01.000000000 +0300
++++ jahshaka/source/Jahshaka/JahCore/jahobjects/coreobject.h	2006-08-15 21:34:43.000000000 +0300
+@@ -42,8 +42,8 @@
+     bool                        isChromaKeyLayer() { return m_is_chroma_key_layer; }
+     void                        setCategory(ObjectCategory::TYPE category) { objtype = category; }
+     ObjectCategory::TYPE              getCategory() { return objtype; }
+-    EffectInfo::EFFECT_CATEGORY JahLayer::getEffectCategory();
+-    EffectInfo::EFFECT_CATEGORY JahLayer::getPluginEffectCategory();
++    EffectInfo::EFFECT_CATEGORY getEffectCategory();
++    EffectInfo::EFFECT_CATEGORY getPluginEffectCategory();
+ 
+     void    setIsChromaKeyLayer(bool flag); 
+     int     getEnabledEffectCount();
+diff -rNud jahshaka-old/source/Jahshaka/JahCore/jahworld/glworld.h jahshaka/source/Jahshaka/JahCore/jahworld/glworld.h
+--- jahshaka-old/source/Jahshaka/JahCore/jahworld/glworld.h	2006-08-15 21:46:05.000000000 +0300
++++ jahshaka/source/Jahshaka/JahCore/jahworld/glworld.h	2006-08-15 21:47:18.000000000 +0300
+@@ -163,8 +163,8 @@
+ 
+     //////////////////////////////////////////////////////////////
+     //for xml scene save 
+-    void GLWorld::SaveAll( std::string const & a_save_filename, bool const a_status );
+-    void GLWorld::SaveAllData( std::fstream & ai_fstream );
++    void SaveAll( std::string const & a_save_filename, bool const a_status );
++    void SaveAllData( std::fstream & ai_fstream );
+     void saveSceneFile( std::string const & a_save_filename, bool const a_status = 0 );
+     void saveAllLayers( std::fstream & ai_strstream );
+     void SaveNodes( std::fstream & ai_fstream , JahLayer* jah_layer );
+diff -rNud jahshaka-old/source/Jahshaka/JahWidgets/interfaceobjs/widget.h jahshaka/source/Jahshaka/JahWidgets/interfaceobjs/widget.h
+--- jahshaka-old/source/Jahshaka/JahWidgets/interfaceobjs/widget.h	2006-08-15 21:57:54.000000000 +0300
++++ jahshaka/source/Jahshaka/JahWidgets/interfaceobjs/widget.h	2006-08-15 21:58:53.000000000 +0300
+@@ -53,7 +53,7 @@
+ // Lifted from QToolButton
+ // only sizes the size of the content, not any button border.
+ //
+-QSize JahToolButton::sizeHint() const
++QSize sizeHint() const
+ {
+ 
+     int w = 0, h = 0;
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/colorize/color.h jahshaka/source/Jahshaka/JahModules/colorize/color.h
+--- jahshaka-old/source/Jahshaka/JahModules/colorize/color.h	2006-08-15 22:14:55.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/colorize/color.h	2006-08-15 22:16:03.000000000 +0300
+@@ -51,7 +51,7 @@
+ 
+ };
+ 
+-GLColorize::~GLColorize() {  }
++~GLColorize() {  }
+ 
+     //object and variable initialization routines
+     void initializeVariables(void);
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/keyer/keyer.h jahshaka/source/Jahshaka/JahModules/keyer/keyer.h
+--- jahshaka-old/source/Jahshaka/JahModules/keyer/keyer.h	2006-08-15 22:14:55.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/keyer/keyer.h	2006-08-15 22:16:58.000000000 +0300
+@@ -52,7 +52,7 @@
+     void            setHsvRange(float4& value) { m_hsv_range = value; }
+     float4&         getRgbaRange() { return m_rgba_range; }
+     void            setRgbaRange(float4& value) { m_rgba_range = value; }
+-    void            GLKeyer::setRgbaValues();
++    void            setRgbaValues();
+ 
+     KeyerColorWidget*   getKeyerColorWidget() { return m_keyer_color_widget; }
+     void                setKeyerColorWidget(KeyerColorWidget* widget) { m_keyer_color_widget = widget; }
+@@ -71,7 +71,7 @@
+ 
+ };
+ 
+-GLKeyer::~GLKeyer() {  }
++~GLKeyer() {  }
+ 
+     //object and variable initialization routines
+     void initializeVariables(void);
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/animation/anime.h jahshaka/source/Jahshaka/JahModules/animation/anime.h
+--- jahshaka-old/source/Jahshaka/JahModules/animation/anime.h	2006-08-15 22:35:43.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/animation/anime.h	2006-08-15 22:36:53.000000000 +0300
+@@ -38,7 +38,7 @@
+         initializeObjects();
+     };
+ 
+-        GLAnime::~GLAnime() { }
++        ~GLAnime() { }
+ 
+         void buildInterface( QHBox* qtinterface);
+         void buildInterfaceMenus( QHBox* leftcontroller, QHBox* rightcontroller );
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/effect/effect.h jahshaka/source/Jahshaka/JahModules/effect/effect.h
+--- jahshaka-old/source/Jahshaka/JahModules/effect/effect.h	2006-08-15 22:58:36.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/effect/effect.h	2006-08-15 22:59:22.000000000 +0300
+@@ -51,7 +51,7 @@
+     initializeObjects();
+ };
+ 
+-GLEffect::~GLEffect() {  }
++~GLEffect() {  }
+ 
+     //object and variable initialization routines
+     void initializeVariables(void);
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/painter/paint.h jahshaka/source/Jahshaka/JahModules/painter/paint.h
+--- jahshaka-old/source/Jahshaka/JahModules/painter/paint.h	2006-08-15 23:25:15.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/painter/paint.h	2006-08-15 23:26:02.000000000 +0300
+@@ -36,7 +36,7 @@
+         initializeObjects();
+ 	};
+ 
+-	GLPaint::~GLPaint() {  }
++	~GLPaint() {  }
+ 
+ 
+ 	void buildInterface( QHBox* qtinterface);
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/text/character.h jahshaka/source/Jahshaka/JahModules/text/character.h
+--- jahshaka-old/source/Jahshaka/JahModules/text/character.h	2006-08-16 00:23:09.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/text/character.h	2006-08-16 00:24:01.000000000 +0300
+@@ -30,7 +30,7 @@
+         initializeObjects();
+     };
+ 
+-    GLChar::~GLChar() {  }
++    ~GLChar() {  }
+ 
+         void buildInterface( QHBox* qtinterface);
+         void buildInterfaceMenus( QHBox* leftcontroller, QHBox* rightcontroller );
+diff -rNud jahshaka-old/source/Jahshaka/JahModules/tracker/tracker.h jahshaka/source/Jahshaka/JahModules/tracker/tracker.h
+--- jahshaka-old/source/Jahshaka/JahModules/tracker/tracker.h	2006-08-16 00:49:04.000000000 +0300
++++ jahshaka/source/Jahshaka/JahModules/tracker/tracker.h	2006-08-16 00:49:58.000000000 +0300
+@@ -113,7 +113,7 @@
+     };
+ 
+ 
+-    GLTracker::~GLTracker() {  }
++    ~GLTracker() {  }
+ 
+ 
+ 
diff --git a/media-video/jahshaka/jahshaka-2.0_rc1.ebuild b/media-video/jahshaka/jahshaka-2.0_rc1.ebuild
new file mode 100644
index 0000000..28b3cf2
--- /dev/null
+++ b/media-video/jahshaka/jahshaka-2.0_rc1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/jahshaka/jahshaka-2.0_rc1.ebuild,v 1.7 2006/08/13 01:08:45 dberkholz Exp $
+
+inherit eutils
+
+MY_P="${P/-2.0_rc/_2.0_RC}"
+DESCRIPTION="The worlds first OpenSource Realtime Editing and Effects System."
+HOMEPAGE="http://www.jahshaka.com"
+SRC_URI="mirror://sourceforge/${PN}fx/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+DEPEND="media-libs/mlt++
+	virtual/glut
+	>=media-libs/freetype-2.1.9
+	=x11-libs/qt-3*"
+
+RDEPEND=${DEPEND}
+
+RESTRICT="nostrip"
+
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
+src_compile() {
+	sed -e "s/qmake/\$\{QTDIR\}\/bin\/qmake QMAKE=\$\{QTDIR\}\/bin\/qmake/" -i ${S}/configure
+	./configure --prefix=/usr \
+	`use_enable static` \
+	`use_enable debug` \
+	|| die "configure failed"
+
+	cd ${S}/plugins
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake plugins.pro
+	cd ${S}
+
+	make || die
+	cd ${S}/plugins
+	make || die "plugins failed"
+}
+
+src_install() {
+
+	cd ${S}
+	make INSTALL_ROOT=${D} DESTDIR=${D} install || die
+	dobin jahshaka
+
+	# They do no harm but we don't like 'CVS' dirs in every subdir
+	for i in $(ls -la -R * | grep CVS | grep / | cut -f1 -d:)
+	do
+	    rm -rf ${i}
+	done
+
+	dodir /usr/lib/jahshaka
+	cp -pPR ${S}/source/OpenLibraries/lib/* ${D}/usr/lib/${PN}/
+	cp -pPR $(find plugins -iname *.so) ${D}usr/share/${PN}/
+	cp -pPR $(find plugins -iname *.fp) ${D}usr/share/${PN}/
+
+	cp -pPR ${S}/database/JahDesktopDB.bak ${D}/usr/share/jahshaka/database/JahDesktopDB
+	chmod 664 ${D}/usr/share/jahshaka/database/*
+
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/"${PN} > ${D}etc/env.d/98${P}
+
+	dodoc README AUTHORS TODO
+}