# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1335306881 -7200
# Node ID d05e40770902d762b5ec1d9e17ff8e0937bbcfdf
# Parent  3a88d3e7ea0cf86c3b435eb1fbba975a0122400f
Up: xine-lib (1.2.1) Split fonts and clean receipt

diff -r 3a88d3e7ea0c -r d05e40770902 xine-fonts/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xine-fonts/receipt	Wed Apr 25 00:34:41 2012 +0200
@@ -0,0 +1,18 @@
+# SliTaz package receipt.
+
+PACKAGE="xine-fonts"
+VERSION="1.2.1"
+CATEGORY="x-window"
+SHORT_DESC="Extra fonts for Xine video player."
+MAINTAINER="pankso@slitaz.org"
+WANTED="xine-lib"
+WEB_SITE="http://www.xinehq.de/"
+DEPENDS="xine"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p  $fs/usr/share/xine-lib
+	cp -a $install/usr/share/xine-lib/fonts \
+		$fs/usr/share/xine-lib
+}
diff -r 3a88d3e7ea0c -r d05e40770902 xine-lib-dev/receipt
--- a/xine-lib-dev/receipt	Wed Apr 25 00:33:33 2012 +0200
+++ b/xine-lib-dev/receipt	Wed Apr 25 00:34:41 2012 +0200
@@ -1,11 +1,10 @@
 # SliTaz package receipt.
 
 PACKAGE="xine-lib-dev"
-VERSION="1.1.19"
+VERSION="1.2.1"
 CATEGORY="development"
 SHORT_DESC="Xine video library."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="xorg xine-lib zlib"
 WANTED="xine-lib"
 WEB_SITE="http://www.xinehq.de/"
 
@@ -13,10 +12,10 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $install/usr/bin $fs/usr
 	chmod 755 $fs/usr/bin/*
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $_pkg/usr/share/aclocal $fs/usr/share
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/share/aclocal $fs/usr/share
 }
diff -r 3a88d3e7ea0c -r d05e40770902 xine-lib/receipt
--- a/xine-lib/receipt	Wed Apr 25 00:33:33 2012 +0200
+++ b/xine-lib/receipt	Wed Apr 25 00:34:41 2012 +0200
@@ -1,40 +1,37 @@
 # SliTaz package receipt.
 
 PACKAGE="xine-lib"
-VERSION="1.1.19"
+VERSION="1.2.1"
 CATEGORY="multimedia"
 SHORT_DESC="Xine video library."
 MAINTAINER="pankso@slitaz.org"
 SUGGESTED="faad2"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.xine-project.org/"
-WGET_URL="http://switch.dl.sourceforge.net/sourceforge/xine/$TARBALL"
+WGET_URL="http://downloads.sourceforge.net/project/xine/$PACKAGE/$VERSION/$TARBALL"
+SUGGESTED="xine-fonts"
 
-DEPENDS="xorg zlib xorg-libXv xorg-libXvMC alsa-lib libogg libvorbis \
-libtheora xorg-libXvMC xorg-libXv libmodplug libmng lcms"
+DEPENDS="zlib xorg-libX11 xorg-libXv xorg-libXvMC alsa-lib libogg libvorbis \
+libtheora xorg-libXvMC xorg-libXv libxcb ffmpeg"
 BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xextproto xorg-videoproto \
-alsa-lib-dev libogg-dev libmodplug-dev libvorbis-dev libtheora-dev freetype-dev \
-faad2-dev perl pkg-config util-linux-uuid-dev libxcb-dev lcms-dev"
+alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
+pkg-config util-linux-uuid-dev libxcb-dev libxcb-dev ffmpeg-dev"
 
 # Rules to configure and make the package.
-#
-# Using --with-external-ffmpeg will make package smaller, but it dont seems
-# to work properly. Last try with external ffmpeg make xine unable to read avi
-# and other video files.
-#
 compile_rules()
 {
 	cd $src
 	sed -i 's/grep -x/grep/' configure
-	grep -qs 'define u8' src/input/vcd/libcdio/_cdio_linux.c ||
-	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
-		src/input/vcd/libcdio/_cdio_linux.c
-	patch -p0 < $stuff/xine-lib-1.1.19-xvmc.patch
+	#grep -qs 'define u8' src/input/vcd/libcdio/_cdio_linux.c ||
+	#sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+	#	src/input/vcd/libcdio/_cdio_linux.c
+	#patch -p0 < $stuff/xine-lib-1.1.19-xvmc.patch
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--with-freetype \
+		--with-xcb \
 		--without-jack \
 		--without-imagemagick \
 		--without-sdl \
@@ -46,22 +43,15 @@
 		--disable-syncfb \
 		--without-esound \
 		--disable-vcd \
+		--disable-musepack \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS &&
-	make DESTDIR=$PWD/_pkg install
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/usr/lib/xine $fs/usr/lib
-
-	# Do we need extra Fonts for subtitle support? \
-	# compiled with freetype for using ttf fonts, xine fonts are only an alternative solution \
-	# should we just ln DejavuSans as in mplayer?
-	# lets keep sans font for extra support
-	mkdir -p  $fs/usr/share/xine/libxine1/fonts/
-	cp -a $_pkg/usr/share/xine/libxine1/fonts/sa* $fs/usr/share/xine/libxine1/fonts/
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/xine $fs/usr/lib
 }