Changes of Revision 18
| [-] | Changed | xine-lib.spec |
|
x 1 2 # norootforbuild3 %define shortname libxine4 %define name libxine15 -%define version 1.1.9.16 +%define version 1.1.107 %define release 18 9 %define major 110 11 Group: Development/Libraries12 URL: http://xinehq.de13 14 -Source0: xine-lib-1.1.9.1.tar.bz215 +Source0: xine-lib-1.1.10.tar.bz216 17 Patch0: vdr-xine-lib-0.8.1.diff18 -Patch1: audio_out2.patch19 +Patch1: xine-lib-libdvdread_udf.diff20 BuildRequires: alsa >= 0.921 BuildRequires: alsa-devel >= 0.922 BuildRequires: arts >= 1.023 BuildRequires: arts-devel >= 1.024 -BuildRequires: jack25 -BuildRequires: jack-devel26 +BuildRequires: jack >= 0.10927 +BuildRequires: libjack0 >= 0.10928 +BuildRequires: libjack-devel >= 0.10929 BuildRequires: audiofile30 BuildRequires: esound31 BuildRequires: esound-devel32 33 Provides: %{name}-devel = %{version}-%{release}34 Provides: xine-devel35 Requires: %{libname} = %{version}-%{release}36 +Requires: jack >= 0.10937 +Requires: libjack0 >= 0.10938 +Requires: libjack-devel >= 0.10939 40 %description -n %{shortname}-devel41 This package contains header files and documentation required to develope42 43 Obsoletes: xine-lib-jack44 Obsoletes: libxine0-jack45 Requires: %{libname} = %{version}-%{release}46 -Requires: jack47 +Requires: libjack0 >= 0.10948 49 %description jack50 libxine sound output plugin for the jack soundserver51 52 %debug_package53 54 %prep55 -%setup -q -n xine-lib-1.1.9.156 +%setup -q -n xine-lib-1.1.1057 %patch0 -p158 %patch1 -p159 60 |
||
| [+] | Changed | vdr-xine-lib-0.8.1.diff ^ |
| @@ -867,7 +867,7 @@ + + if (this->trick_speed_mode != data->on) + { -+fprintf(stderr, "ßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßßß\n"); ++fprintf(stderr, "���������������������������������\n"); + this->trick_speed_mode = data->on; + + _x_demux_seek(this->stream, 0, 0, 0); @@ -2271,13 +2271,11 @@ diff -uNr xine-lib-1.1.9.orig/src/vdr/Makefile.am xine-lib-1.1.9/src/vdr/Makefile.am --- xine-lib-1.1.9.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ xine-lib-1.1.9/src/vdr/Makefile.am 2008-01-07 19:59:26.000000000 +0100 -@@ -0,0 +1,17 @@ +@@ -0,0 +1,15 @@ +include $(top_srcdir)/misc/Makefile.common + + + -+libdir = $(XINE_PLUGINDIR) -+ +AM_CFLAGS = -D_LARGEFILE64_SOURCE + +lib_LTLIBRARIES = \ | ||
| [+] | Added | xine-lib-libdvdread_udf.diff ^ |
| @@ -0,0 +1,99 @@ +Includes ifo patch from http://tobias.rautenkranz.ch/libdvdread_ifo.html which enables playback of Video-DVD's which are "protected" by bad blocks +diff -ur a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c +--- a/src/input/libdvdnav/dvd_udf.c 2007-08-19 01:36:46.000000000 +0200 ++++ b/src/input/libdvdnav/dvd_udf.c 2008-01-23 21:43:49.000000000 +0100 +@@ -38,10 +38,16 @@ + #include <sys/stat.h> + #include <unistd.h> + #include <inttypes.h> ++#ifndef __WIN32__ ++#include <fnmatch.h> ++#endif + + #include "dvd_reader.h" + #include "dvd_udf.h" + ++#include "ifo_types.h" ++#include "ifo_read.h" ++ + /* Private but located in/shared with dvd_reader.c */ + extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, + size_t block_count, unsigned char *data, +@@ -777,6 +783,77 @@ + uint32_t UDFFindFile( dvd_reader_t *device, char *filename, + uint32_t *filesize ) + { ++ uint32_t offset=0; ++#ifndef __WIN32__ ++ if (!fnmatch("/VIDEO_TS/VTS_[0-9][0-9]_[0-9].???", filename, FNM_PATHNAME)) { ++#else ++ if (strlen("/VIDEO_TS/VTS_01_1.VOB") == strlen(filename) ++ && !strncmp(filename, "/VIDEO_TS/VTS_", strlen("/VIDEO_TS/VTS_")) ) { ++#endif ++ size_t len = strlen(filename); ++ char *extension = &filename[len-3]; ++ if (!strcmp(extension, "IFO") || !strcmp(extension, "VOB")) { ++ int title = atoi(&filename[len-8]); ++ int part = atoi(&filename[len-5]); ++ ++ ifo_handle_t *ifo_handle = ifoOpen(device, 0); ++ if (0 == ifo_handle) ++ return 0; ++ ++ if (title > ifo_handle->tt_srpt->nr_of_srpts) { ++ ifoClose(ifo_handle); ++ return 0; ++ ++ } ++ ++ uint32_t tmp_filesize; ++ offset += UDFFindFile(device, "/VIDEO_TS/VIDEO_TS.IFO", &tmp_filesize); ++ ++ ++ int i; ++ for (i=0; i<ifo_handle->tt_srpt->nr_of_srpts; i++) ++ if (title == ifo_handle->tt_srpt->title[i].title_set_nr) ++ break; ++ ++ if (i == ifo_handle->tt_srpt->nr_of_srpts) { ++ /* not found */ ++ ifoClose(ifo_handle); ++ return 0; ++ } ++ offset += ifo_handle->tt_srpt->title[i].title_set_sector; ++ ++ ifoClose(ifo_handle); ++ ++ if (!strcmp(extension, "VOB")) { ++ ifo_handle = ifoOpen(device, title); ++ if (0 == ifo_handle) ++ return 0; ++ ++ switch(part) { ++ case 0: ++ if (0 == ifo_handle->vtsi_mat->vtsm_vobs) ++ return 0; ++ offset += ifo_handle->vtsi_mat->vtsm_vobs; ++ break; ++ case 1: ++ if (0 == ifo_handle->vtsi_mat->vtstt_vobs) ++ return 0; ++ offset += ifo_handle->vtsi_mat->vtstt_vobs; ++ break; ++ default: /* can't get other parts (also no need to) */ ++ offset = 0; ++ break; ++ } ++ ++ ifoClose(ifo_handle); ++ } ++ ++ } ++ ++ *filesize = 1000000; /* File size unknown */ ++ if (offset != 0) ++ return offset; ++ } + uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; + uint8_t *LogBlock = (uint8_t *)(((uintptr_t)LogBlock_base & ~((uintptr_t)2047)) + 2048); + uint32_t lbnum; | ||
| [+] | Added | xine-lib.spec.new ^ |
| @@ -0,0 +1,1509 @@ +# Packmangroup: Multimedia +# Packmanpackagename: xine-lib +# Packman: Manfred Tremmel +# Packmanpackagedesc: <p>Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...</p><p>You need a frontend for xine-lib like <a href="http://packman.links2linux.org/package/xine-ui">xine-ui</a>, <a href="http://packman.links2linux.org/package/gxine">gxine</a>, <a href="http://packman.links2linux.org/package/kaffeine">kaffeine</a> or <a href="http://packman.links2linux.org/package/totem">totem</a>.</p><p>Since 1-rc6 the package number is reduced, all you may miss, is in the base package</p><p>If you want to play css encrypted Video-DVD's, you need to install <a href="http://packman.links2linux.org/package/libdvdcss2">libdvdcss</a>.</p> +# Packmanpackagedesc_de: <p>Großartiger Video- und Multimediaplayer mit Support für DVD, MPEG, AVI, DivX, VCD,Quicktime ...</p><p>Bitte beachten Sie, dass Sie neben der xine-lib auch eine Bedienoberfläche wie <a href="http://packman.links2linux.org/package/xine-ui">xine-ui</a>, <a href="http://packman.links2linux.org/package/gxine">gxine</a>, <a href="http://packman.links2linux.org/package/kaffeine">kaffeine</a> oder <a href="http://packman.links2linux.org/package/totem">totem</a> benötigen.</p><p>Seit 1-rc6 wurde die Zahl der Pakete reduziert, alles was sie eventuell vermissen, wurde in das Basispaket integriert.</p><p>Wenn Sie css verschlüsselte Video-DVDs abspielen wollen, müssen Sie zusätzlich die <a href="http://packman.links2linux.org/package/libdvdcss2">libdvdcss</a> installieren.</p> +# norootforbuild +%define shortname libxine +%define name libxine1 +%define version 1.1.10 +%define release 0.pm.0 + +%define major 1 +%define libname %{shortname}%{major} + +# Build separat packages: +# 1 create a sparate package +# 0 include files in main package +%if %{?BUILD_AA:0}%{!?BUILD_AA:1} +%define BUILD_AA 1 +%endif +%if %{?BUILD_ALSA:0}%{!?BUILD_ALSA:1} +%define BUILD_ALSA 0 +%endif +%if %{?BUILD_ARTS:0}%{!?BUILD_ARTS:1} +%define BUILD_ARTS 1 +%endif +%if %{?BUILD_DEVEL:0}%{!?BUILD_DEVEL:1} +%define BUILD_DEVEL 1 +%endif +%if %{?BUILD_DVB:0}%{!?BUILD_DVB:1} +%define BUILD_DVB 1 +%endif +%if %{?BUILD_DVD:0}%{!?BUILD_DVD:1} +%define BUILD_DVD 0 +%endif +%if %{?BUILD_DXR3:0}%{!?BUILD_DXR3:1} +%define BUILD_DXR3 1 +%endif +%if %{?BUILD_ESD:0}%{!?BUILD_ESD:1} +%define BUILD_ESD 0 +%endif +%if %{?BUILD_FLAC:0}%{!?BUILD_FLAC:1} +%define BUILD_FLAC 0 +%endif +%if %{?BUILD_GNOME_VFS:0}%{!?BUILD_GNOME_VFS:1} +%define BUILD_GNOME_VFS 1 +%endif +%if %{?BUILD_OGG:0}%{!?BUILD_OGG:1} +%define BUILD_OGG 0 +%endif +%if %{?BUILD_OPENGL:0}%{!?BUILD_OPENGL:1} +%define BUILD_OPENGL 0 +%endif +%if %{?BUILD_SDL:0}%{!?BUILD_SDL:1} +%define BUILD_SDL 1 +%endif +%if %{?BUILD_DIRECTFB:0}%{!?BUILD_DIRECTFB:1} +%define BUILD_DIRECTFB 1 +%endif +%if %{?BUILD_SYNCFB:0}%{!?BUILD_SYNCFB:1} +%define BUILD_SYNCFB 1 +%endif +%if %{?BUILD_W32DLL:0}%{!?BUILD_W32DLL:1} +%define BUILD_W32DLL 1 +%endif +%if %{?BUILD_XVMC:0}%{!?BUILD_XVMC:1} +%define BUILD_XVMC 1 +%endif +%if %{?BUILD_STK:0}%{!?BUILD_STK:1} +%define BUILD_STK 0 +%endif +%if %{?BUILD_JACK:0}%{!?BUILD_JACK:1} +%define BUILD_JACK 1 +%endif +%if %{?BUILD_PULSE:0}%{!?BUILD_PULSE:1} +%define BUILD_PULSE 1 +%endif + +Name: %{name} +# Packmandesc: A portable video/audio library for unix-like systems. Basic package. +# Packmandesc_de: Eine portabele Audio-/Video-Bibliothek für unixartige Systeme. Basispaket. +# Packmandepends: alsa libogg libvorbis libtheora speex libcaca +Summary: A portable video/audio library for unix-like systems. +Summary(cs): Přenositelná video a audio knihovna pro unixovské systémy +Summary(de): Eine portabele Audio-/Video-Bibliothek für unixartige Systeme. +Summary(fi): Joustava video- ja ääniohjelmointikirjasto Unix-tyylisille käyttöjärjestelmille. +Version: %{version} +Release: %{release} +License: GPL +Group: Development/Libraries +URL: http://xinehq.de + +Source0: xine-lib-1.1.10.tar.bz2 + +Patch0: vdr-xine-lib-0.8.1.diff +Patch1: xine-lib-libdvdread_udf.diff +BuildRequires: alsa >= 0.9 +BuildRequires: alsa-devel >= 0.9 +BuildRequires: arts >= 1.0 +BuildRequires: arts-devel >= 1.0 +BuildRequires: jack >= 0.109 +BuildRequires: libjack0 >= 0.109 +BuildRequires: libjack-devel >= 0.109 +BuildRequires: audiofile +BuildRequires: esound +BuildRequires: esound-devel +BuildRequires: flac +BuildRequires: flac-devel +%if %suse_version >= 910 +BuildRequires: freeglut +BuildRequires: freeglut-devel +%else +BuildRequires: mesaglut +BuildRequires: mesaglut-devel +%endif +%if %suse_version >= 1010 +BuildRequires: libpulse-devel +%endif +BuildRequires: freetype2 +BuildRequires: freetype2-devel +BuildRequires: glib2 +BuildRequires: glib2-devel +BuildRequires: glibc +BuildRequires: glibc-devel +BuildRequires: ImageMagick-devel +BuildRequires: libmng +BuildRequires: libmng-devel +BuildRequires: libogg >= 1.1 +BuildRequires: libogg-devel >= 1.1 +BuildRequires: libpng +BuildRequires: libpng-devel +BuildRequires: libtheora >= 0.9_1.0alpha3 +BuildRequires: libtheora-devel >= 0.9_1.0alpha3 +BuildRequires: libvorbis >= 1.0.1 +BuildRequires: libvorbis-devel >= 1.0.1 +BuildRequires: ncurses +BuildRequires: ncurses-devel +BuildRequires: slang +BuildRequires: slang-devel +BuildRequires: speex >= 1.1 +BuildRequires: speex-devel >= 1.1 +%if %suse_version >= 920 +BuildRequires: xorg-x11-devel +BuildRequires: xorg-x11-libs +%else +BuildRequires: XFree86-libs +BuildRequires: XFree86-devel +%endif +BuildRequires: libmodplug +BuildRequires: libcaca-devel +BuildRequires: zlib +BuildRequires: pkgconfig +BuildRequires: libsmbclient +BuildRequires: libsmbclient-devel +BuildRequires: SDL +BuildRequires: SDL-devel +BuildRequires: glib2 +BuildRequires: glib2-devel +BuildRequires: gnome-vfs2 +BuildRequires: gnome-vfs2-devel +BuildRequires: libbonobo +BuildRequires: libbonobo-devel +BuildRequires: orbit2 +BuildRequires: orbit2-devel +BuildRequires: DirectFB +%if %suse_version >= 1020 +BuildRequires: DirectFB-devel +%endif +BuildRequires: boost +BuildRequires: boost-devel +BuildRequires: freetype2 +BuildRequires: freetype2-devel +BuildRequires: gconf2-devel +BuildRequires: popt-devel +BuildRequires: libxml2-devel +BuildRequires: libfame +BuildRequires: libfame-devel +%if %suse_version >= 1010 +BuildRequires: mDNSResponder-lib +BuildRequires: mDNSResponder-devel +%endif +%if %suse_version >= 910 +%if %suse_version <= 920 +BuildRequires: libXvMCW +Requires: libXvMCW +%endif +%endif +BuildRequires: vcdimager-devel +BuildRequires: libcdio-devel +BuildRequires: libffmpeg0 +BuildRequires: libffmpeg-devel +Requires: alsa >= 0.9 +Requires: audiofile +Requires: esound +Requires: flac +%if %suse_version >= 910 +Requires: freeglut +%else +Requires: mesaglut | ||