packages: vitooki/vitooki.spec - seems building

[glen]

Author: glen                         Date: Thu Aug  5 14:23:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- seems building

---- Files affected:
packages/vitooki:
   vitooki.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/vitooki/vitooki.spec
diff -u packages/vitooki/vitooki.spec:1.3 packages/vitooki/vitooki.spec:1.4
--- packages/vitooki/vitooki.spec:1.3	Thu Aug  5 15:26:51 2010
+++ packages/vitooki/vitooki.spec	Thu Aug  5 16:23:38 2010
@@ -11,7 +11,8 @@
 License:	GPL v2
 Group:		Applications
 Source0:	%{name}-20100804.tar.bz2
-Patch0:	gcc.patch
+Patch0:		gcc.patch
+Patch1:		optflags.patch
 # Source0-md5:	-
 URL:		http://vitooki.sourceforge.net/
 BuildRequires:	SDL-devel
@@ -38,6 +39,7 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 sed -i -e '/all4itec:/s/ffmpeg//' Makefile # untouched
 sed -i -e '/all4itec:/s/lame//' Makefile # untouched
@@ -49,6 +51,14 @@
 sed -i -e '/all4itec:/s/libmatroska//' Makefile
 sed -i -e '/all4itec:/s/libebml//' Makefile
 
+install -d 3rdparty/system-libs
+mv 3rdparty/{lame,paragui,libmad*,libtheora*,libdvdcss,libdvdread,libmatroska,libebml} 3rdparty/system-libs
+
+# error with UINT64_C symbol
+#mv 3rdparty/ffmpeg 3rdparty/system-libs
+# need "bitstream/bitstream.h"
+#mv 3rdparty/xvidcore* 3rdparty/system-libs
+
 %build
 cd 3rdparty/sord
 if [ ! -f Makefile ]; then
@@ -61,15 +71,28 @@
 
 %{__make} -j1 commonucl vitooki \
 	PWD=$(pwd) \
-	CPP="%{__cxx}" \
-	GCC="%{__cc}" \
 	PREFIX=%{_prefix} \
-	SDL_LIBS=%{_libdir} \
+	GCC="%{__cc}" \
+	CPP="%{__cxx}" \
+	OPT_CFLAGS="%{rpmcflags}" \
+	OPT_CPPFLAGS="%{rpmcppflags} -funroll-loops -DVITOOKI_DEBUG_LEVEL=0 -fPIC" \
+	xRELEASE_CPPFLAGS="%{rpmcppflags} -funroll-loops -DVITOOKI_DEBUG_LEVEL=0 -fPIC" \
+	OPT_LDFLAGS="%{rpmldflags}" \
+	SDL_LIBS="" \
+	LIBMAD_LIBS="" \
+	X11_LIBS="" \
+	QT_LIBS="" \
+	EXPAT_LIBS="" \
+	QTDIR=/usr \
+	xFFMPEG="/usr/include" \
+	QT_INCLUDES="-I/usr/include/qt" \
+	XVIDLIB="-lxvidcore" \
 %ifarch %{ix86}
 	VITOOKI_BUILD_ARCH=intel32 \
 %endif
 %ifarch %{x8664}
 	VITOOKI_BUILD_ARCH=intel64 \
+	EXTRA_FLAGS="-fPIC" \
 %endif
 
 %{?with_apidocs:doxygen doxygen.cfg}
@@ -90,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/08/05 14:23:38  glen
+- seems building
+
 Revision 1.3  2010/08/05 13:26:51  glen
 - fix gcc includes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vitooki/vitooki.spec?r1=1.3&r2=1.4&f=u