Author: lenny
Date: Thu Feb 15 11:31:02 2007
New Revision: 121336
Added:
packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0-gcc-warnings.patch.bz2
(contents, props changed)
packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0-openassetlib-link.patch.bz2
(contents, props changed)
packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0-size_t.patch.bz2
(contents, props changed)
packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0.0-20060618.tar.bz2
(contents, props changed)
packages/cooker/jahshaka/current/SOURCES/jahshaka-plugins-gcc41warnings.patch.bz2
(contents, props changed)
Removed:
packages/cooker/jahshaka/current/SOURCES/jahshaka_2.0_RC1.tar.bz2
Modified:
packages/cooker/jahshaka/current/SPECS/jahshaka.spec
Log:
Update to 2.0 RC4 snapshot
Added:
packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0-gcc-warnings.patch.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0-openassetlib-link.patch.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0-size_t.patch.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/jahshaka/current/SOURCES/jahshaka-2.0.0-20060618.tar.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/jahshaka/current/SOURCES/jahshaka-plugins-gcc41warnings.patch.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/jahshaka/current/SPECS/jahshaka.spec
==============================================================================
--- packages/cooker/jahshaka/current/SPECS/jahshaka.spec (original)
+++ packages/cooker/jahshaka/current/SPECS/jahshaka.spec Thu Feb 15
11:31:02 2007
@@ -1,48 +1,92 @@
-%define name jahshaka
-%define version 2.0
-%define release 0.RC1.1mdk
-
-Summary: Video Editing and Effects
-Name: %{name}
-Version: %{version}
-Release: %{release}
-License: GPL
-Group: Video
-Url: http://www.jahshaka.com/
-Source: %{name}_%{version}_RC1.tar.bz2
-Buildroot: %{_tmppath}/%{name}-buildroot
-BuildRequires: freetype2-devel libMesaglut-devel qt3-devel
libavifile-devel
+%define snapshot 20060618
+%define major 1.0.0
+
+%define libname %mklibname %name %major
+
+Name: jahshaka
+Summary: OpenSource Realtime Editing and Effects System
+Version: 2.0.0
+Release: 0.RC4.%snapshot.1mdv2007.0
+Source0: %{name}-%{version}-%{snapshot}.tar.bz2
+Source1: icons-%{name}.tar.bz2
+Patch0: jahshaka-plugins-gcc41warnings.patch.bz2
+Patch1: jahshaka-2.0-gcc-warnings.patch.bz2
+Patch2: jahshaka-2.0-openassetlib-link.patch.bz2
+Patch3: jahshaka-2.0-size_t.patch.bz2
+URL: http://www.jahshaka.com
+License: GPL
+Group: Video
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: GL-devel
BuildRequires: ImageMagick
+BuildRequires: libavifile-devel
+BuildRequires: mlt-devel
+BuildRequires: mlt++-devel
+BuildRequires: openlibraries-devel
+BuildRequires: qt3-devel
%description
The worlds first OpenSource Realtime Editing and Effects System. Jahshaka
takes advantage of the power of OpenGL and OpenML to give its users
exceptional levels of performance.
+
+%package -n %{libname}
+Summary: Main libraries for jahshaka
+Group: System/Libraries
+Provides: %{name} = %{version}-%{release}
+
+%description -n %{libname}
+This package contains the libraries needed to run jahshaka.
+
%prep
-%setup -q -n %name
-perl -p -i -e 's/FT_Open_Flags/FT_UInt/g' jah/objectlibs/FTGL/FTFace.cpp
-perl -p -i -e 's|new MetalStyle|QStyleFactory::create("metalstyle")||g'
jah/Source/jahstyle.cpp
+%setup -q -n %{name}
+
+#patch0 -p1 -b .gcc41warn
+%patch1 -p1 -b .gcc41
+%patch2 -p1 -b .link
+%ifarch x86_64
+%patch3 -p1 -b .size_t
+%endif
+
+# Adjust CXXFLAGS...
+find . -type f -name '*.pro' | while read r; do
+ cat >>$r <<'EOF'
+unix {
+ QMAKE_CXXFLAGS_DEBUG += -fexceptions -fvisibility=default -Wall -Werror
+ QMAKE_CXXFLAGS_RELEASE += -fexceptions -fvisibility=default -Wall
-Werror
+}
+EOF
+done
+
+# Fix libpath for 64bit
+perl -pi -e '[EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]'
./source/OpenLibraries/lib_standard.pro
%build
-export QTDIR=/usr/lib/qt3
-export PATH=$PATH:/usr/lib/qt3/bin
-%configure
+if [ ! -z $QTDIR ]; then
+ export QTPATH=$QTDIR/bin
+ export PATH=$PATH:$QTPATH
+else
+ export PATH=$PATH:%{_prefix}/lib/qt3
+fi
+export LD_LIBRARY_PATH=`pwd`/source/OpenLibraries/lib
+
+%configure \
+ --prefix=%{_prefix}
+
+pushd source/OpenLibraries/openmedialib/mediaobject
+qmake mediaobject.pro
+make
+popd
+
make
+%configure --prefix=$RPM_BUILD_ROOT%{_prefix}
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%_libdir/%name
-strip %name
-cp -r database fonts media Pixmaps scenes %name $RPM_BUILD_ROOT/%_libdir/%name
-rm -fr $RPM_BUILD_ROOT/%_libdir/%name/Pixmaps/.xvpics
-mkdir -p $RPM_BUILD_ROOT/%_bindir
-echo '#!/bin/bash' > $RPM_BUILD_ROOT/%_bindir/%name
-echo 'cd /usr/lib/jahshaka' >> $RPM_BUILD_ROOT/%_bindir/%name
-echo './jahshaka' >> $RPM_BUILD_ROOT/%_bindir/%name
-chmod 755 $RPM_BUILD_ROOT/%_bindir/%name
+make install DESTDIR="$RPM_BUILD_ROOT"
-# Mandrake Menu entry
+# Mandriva Menu entry
mkdir -p $RPM_BUILD_ROOT%{_menudir}
cat > $RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
?package(%{name}): command="%{_bindir}/%{name}" \
@@ -50,32 +94,93 @@
icon="%{name}.png" \
section="Multimedia/Video" \
title="Jahshaka" \
- longtitle="Video editing and effects"
+%if %{mdkversion} >= 200610
+ xdg=true \
+%endif
+ longtitle="RealTime Editing and Effects System"
EOF
-# icon
-mkdir -p $RPM_BUILD_ROOT/%_liconsdir
-convert -size 48x48 Pixmaps/jahlogo.png $RPM_BUILD_ROOT/%_liconsdir/%name.png
-mkdir -p $RPM_BUILD_ROOT/%_iconsdir
-convert -size 32x32 Pixmaps/jahlogo.png $RPM_BUILD_ROOT/%_iconsdir/%name.png
-mkdir -p $RPM_BUILD_ROOT/%_miconsdir
-convert -size 16x16 Pixmaps/jahlogo.png $RPM_BUILD_ROOT/%_miconsdir/%name.png
+# Icons
+mkdir -p $RPM_BUILD_ROOT/%{_iconsdir}
+tar jxf %{SOURCE1} -C %{buildroot}%{_iconsdir}
+
+# Create .desktop
+%if %{mdkversion} >= 200610
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+cat > $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop <<EOF
+[Desktop Entry]
+Name=Jahshaka
+Comment=%{summary}
+Exec=%{_bindir}/%{name} %f
+Icon=%{name}
+Terminal=false
+Type=Application
+Categories=X-MandrivaLinux-Multimedia-Graphics;Graphics;
+Encoding=UTF-8
+EOF
+
+desktop-file-install --vendor="" \
+ --remove-category="Application" \
+ --add-category="X-MandrivaLinux-Multimedia-Graphics" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications
$RPM_BUILD_ROOT%{_datadir}/applications/*
+%endif
+
+find $RPM_BUILD_ROOT%{_datadir} -type f -print0 | xargs -0 chmod 644
+find $RPM_BUILD_ROOT%{_datadir} -type f -name '*.so*' -print0| xargs -0 chmod
755
+
+%clean
+rm -rf $RPM_BUILD_ROOT
%post
%{update_menus}
-
+
%postun
%{clean_menus}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -n %{libname} -p /sbin/ldconfig
+
+%postun -n %{libname} -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING README TODO
-%_bindir/*
-%_libdir/%{name}
-%_menudir/%{name}
-%_liconsdir/%{name}.png
-%_iconsdir/%{name}.png
-%_miconsdir/%{name}.png
+%doc README INSTALL COPYING AUTHORS
+%{_datadir}/%{name}
+%{_bindir}/*
+%{_menudir}/%{name}
+%{_liconsdir}/%{name}.png
+%{_iconsdir}/%{name}.png
+%{_miconsdir}/%{name}.png
+%{_iconsdir}/hicolor/*/%{name}.png
+%if %{mdkversion} >= 200610
+%{_datadir}/applications/*
+%endif
+
+%files -n %{libname}
+%defattr(-,root,root)
+%{_libdir}/lib*.so*
+
+%changelog
+* Sat Sep 16 2006 Giuseppe Ghib� <[EMAIL PROTECTED]>
2.0.0-0.RC4.20060618.1mdv2007.0
+- Release 2.0-RC4 snapshot 20060618.
+- Removed Patch4.
+
+* Sat Sep 16 2006 Giuseppe Ghib� <[EMAIL PROTECTED]> 2.0.0-0.RC3.1mdv2007.0
+- Release 2.0-RC3.
+- merged Patch0,2 from ArkLinux, and use same QMAKE_CXXFLAGS_RELEASE.
+- Added Patch3 for size_t printf errors.
+- Added Patch4, for fixing openlibraries includes.
+
+* Thu Oct 06 2005 Lenny Cartier <[EMAIL PROTECTED]> 2.0-0.RC1.1mdk
+- 2.0.0RC1
+
+* Thu Dec 11 2003 Austin Acton <[EMAIL PROTECTED]> 1.9-0.alpha5.1mdk
+- re-introduce as 1.9alpha5
+
+* Wed Jan 30 2002 Lenny Cartier <[EMAIL PROTECTED]> 1.8.5-1mdk
+- 1.8.5
+
+* Mon Oct 15 2001 Lenny Cartier <[EMAIL PROTECTED]> 1.7.2-1mdk
+- 1.7.2
+
+* Wed Sep 26 2001 Lenny Cartier <[EMAIL PROTECTED]> 1.5-1mdk
+- new in contribs
