Changes of Revision 9
[-] | Changed | xine-lib.spec |
x 1
2 # norootforbuild 3 %define shortname libxine 4 %define name libxine1 5 -%define version 1.1.8 6 +%define version 1.1.9 7 %define release 1 8 9 %define major 1 10
11 %if %{?BUILD_AA:0}%{!?BUILD_AA:1} 12 %define BUILD_AA 1 13 %endif 14 +%if %{?BUILD_ALSA:0}%{!?BUILD_ALSA:1} 15 +%define BUILD_ALSA 0 16 +%endif 17 %if %{?BUILD_ARTS:0}%{!?BUILD_ARTS:1} 18 %define BUILD_ARTS 1 19 %endif 20
21 %if %{?BUILD_DVB:0}%{!?BUILD_DVB:1} 22 %define BUILD_DVB 1 23 %endif 24 +%if %{?BUILD_DVD:0}%{!?BUILD_DVD:1} 25 +%define BUILD_DVD 0 26 +%endif 27 %if %{?BUILD_DXR3:0}%{!?BUILD_DXR3:1} 28 %define BUILD_DXR3 1 29 %endif 30 +%if %{?BUILD_ESD:0}%{!?BUILD_ESD:1} 31 +%define BUILD_ESD 0 32 +%endif 33 +%if %{?BUILD_FLAC:0}%{!?BUILD_FLAC:1} 34 +%define BUILD_FLAC 0 35 +%endif 36 %if %{?BUILD_GNOME_VFS:0}%{!?BUILD_GNOME_VFS:1} 37 %define BUILD_GNOME_VFS 1 38 %endif 39 +%if %{?BUILD_OGG:0}%{!?BUILD_OGG:1} 40 +%define BUILD_OGG 0 41 +%endif 42 +%if %{?BUILD_OPENGL:0}%{!?BUILD_OPENGL:1} 43 +%define BUILD_OPENGL 0 44 +%endif 45 %if %{?BUILD_SDL:0}%{!?BUILD_SDL:1} 46 %define BUILD_SDL 1 47 %endif 48
49 %if %{?BUILD_XVMC:0}%{!?BUILD_XVMC:1} 50 %define BUILD_XVMC 1 51 %endif 52 +%if %{?BUILD_STK:0}%{!?BUILD_STK:1} 53 +%define BUILD_STK 0 54 +%endif 55 %if %{?BUILD_JACK:0}%{!?BUILD_JACK:1} 56 %define BUILD_JACK 1 57 %endif 58
59 Group: Development/Libraries 60 URL: http://xinehq.de 61 62 -Source0: xine-lib-1.1.8.tar.bz2 63 +Source0: xine-lib-1.1.9.tar.bz2 64 65 -Patch0: vdr-xine-lib-0.7.12.diff 66 -Patch1: vdr-xine-lib-with-sockets-0.7.12.diff 67 -Patch2: libxine1-ffmpeg.diff 68 +Patch0: vdr-xine-lib-0.8.1.diff 69 +Patch1: audio_out2.patch 70 BuildRequires: alsa >= 0.9 71 BuildRequires: alsa-devel >= 0.9 72 BuildRequires: arts >= 1.0 73
74 http://www.gnu.org/licenses/gpl.html 75 %endif 76 77 +%if %BUILD_ALSA 78 +%package alsa 79 +Summary: libxine sound output plugin for alsa >= 0.9 80 +Summary(cs): Zvukový výstupní modul libxine pro ALSA >= 0.9 81 +Summary(de): libxine Soundausgabeplguin für Alsa >= 0.9 82 +Summary(fi): libxine-Ddnilisdke uudelle Linux:n ddniarkkitehtuurille (ALSA >= 0.9) 83 +Group: Development/Libraries 84 +Obsoletes: xine-lib-alsa09 85 +Obsoletes: libxine0-alsa09 86 +Obsoletes: %{libname}-alsa09 87 +Provides: %{libname}-alsa09 88 +Requires: %{libname} = %{version}-%{release} 89 +Requires: alsa >= 0.9 90 + 91 +%description alsa 92 +libxine sound output plugin for alsa >= 0.9 93 + 94 +%description alsa -l cs 95 +Zvukový výstupní modul libxine pro ALSA >= 0.9. 96 + 97 +%description alsa -l de 98 +libxine Soundausgabe Plugin für alsa >= 0.9 99 + 100 +%description alsa -l fi 101 +libxine-ddnilisdke uudelle Linux:n ddniarkkitehtuurille (ALSA >= 0.9) 102 +%endif 103 + 104 %if %BUILD_ARTS 105 %package arts 106 Summary: libxine sound output plugin for arts (KDE-soundserver) 107
108 libxine-Ddnilisdke Arts ddnipalvelimelle (KDE:n ddnipalvelin) 109 %endif 110 111 +%if %BUILD_ESD 112 +%package esd 113 +Summary: libxine sound output plugin for enlightmend sound daemon 114 +Summary(cs): Zvukový výstupní modul libxine pro Enlightmend Sound Daemon 115 +Summary(de): libxine Soundausgabeplugin für den Enlightmend Sound Daemon 116 +Summary(fi): libxine-ddnilisdke Enlightmend ddnipalvelimelle 117 +Group: Development/Libraries 118 +Obsoletes: xine-lib-esd 119 +Obsoletes: libxine0-esd 120 +Requires: %{libname} = %{version}-%{release} 121 +Requires: esound 122 + 123 +%description esd 124 +libxine sound output plugin for enlightmend sound daemon (Gnome and Enlightment) 125 + 126 +%description esd -l cs 127 +Zvukový výstupní modul libxine pro Enlightmend Sound Daemon. 128 + 129 +%description esd -l de 130 +libxine Soundausgabeplugin für den Enlightmend Sound Daemon (Gnome und Enlightment) 131 + 132 +%description esd -l fi 133 +libxine-ddnilisdke Enlightmend ddnipalvelimelle 134 +%endif 135 136 %if %BUILD_SDL 137 %package sdl 138
139 libxine-Videolisdke aa-grafiikkakirjastolle (ASCII Art) 140 %endif 141 142 +%if %BUILD_OPENGL 143 +%package opengl 144 +Summary: libxine video output plugin using OpenGL (3D graphic cards) 145 +Summary(cs): Videovýstupní modul libxine používající OpenGL (3D grafické karty) 146 +Summary(de): libxine Videoausgabeplugin per OpenGL (3D Grafikkarte) 147 +Group: Development/Libraries 148 +Obsoletes: xine-lib-opengl 149 +Obsoletes: libxine0-opengl 150 +Requires: %{libname} = %{version}-%{release} 151 + 152 +%description opengl 153 +libxine video output plugin using OpenGL (3D graphic cards) 154 + 155 +%description opengl -l cs 156 +Videovýstupní modul libxine, který používá OpenGL (3D grafické karty). 157 + 158 +%description opengl -l de 159 +libxine Videoausgabeplugin per OpenGL (3D Grafikkarte) 160 +%endif 161 + 162 %if %BUILD_SYNCFB 163 %package syncfb 164 Summary: libxine video output plugin using synchroniced framebuffer (Matrox cards) 165
166 libxine-Videolisdke Matrox-ndyttvkorttien synkronisoitua ndyttvmuistia varten. 167 %endif 168 169 +%if %BUILD_DVD 170 +%package dvd 171 +Summary: libxine input plugin for playing video-dvd's with dvd-navigation 172 +Summary(cs): Vstupní modul libxine na přehrávání VideoDVD s DVD navigací 173 +Summary(de): libxine Inputplugin zum abspielen von Video-DVDs mit DVD-Navigation 174 +Summary(fi): libxine-Lukulisdke, jolla kdyttdjd voi soittaa DVD-levyjd 175 +Group: Development/Libraries 176 +Obsoletes: xine-dvdnav 177 +Requires: %{libname} = %{version}-%{release} 178 +Requires: libdvdcss >= 1.2 179 +Requires: zlib 180 + 181 +%description dvd 182 +libxine input plugin for playing video-dvd's with dvd-navigation 183 + 184 +%description dvd -l cs 185 +Vstupní modul libxine na přehrávání VideoDVD s DVD navigací. 186 + 187 +%description dvd -l de 188 +libxine Inputplugin zum abspielen von Video-DVDs mit DVD-Navigation 189 + 190 +%description dvd -l fi 191 +libxine-Lukulisdke, jolla kdyttdjd voi soittaa DVD-levyjd 192 +%endif 193 + 194 %if %BUILD_DVB 195 %package dvb 196 Summary: libxine input plugin for DigitalTV devices 197
198 libxine-Lukulisdke Totem ohjelmaa varten, joka on libxine Gnome2 kdyttvliittymd 199 %endif 200 201 |
||
[+] | Added | audio_out2.patch ^ |
@@ -0,0 +1,23 @@ +diff -r 6e12ae33df4d src/xine-engine/audio_out.c +--- a/src/xine-engine/audio_out.c Wed Dec 26 23:46:36 2007 +0000 ++++ b/src/xine-engine/audio_out.c Thu Dec 27 12:49:41 2007 +0100 +@@ -287,7 +287,6 @@ struct audio_fifo_s { + int num_buffers; + }; + +-static int ao_set_property (xine_audio_port_t *this_gen, int property, int value); + + static audio_fifo_t *fifo_new (xine_t *xine) { + +@@ -1612,11 +1611,6 @@ static void ao_close(xine_audio_port_t * + xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_out: no streams left, closing driver\n"); + + if (this->audio_loop_running) { +- if (this->clock->speed == XINE_SPEED_PAUSE || +- (this->clock->speed != XINE_FINE_SPEED_NORMAL && !this->slow_fast_audio)) { +- /* discard buffers, otherwise we'll wait forever */ +- ao_set_property(this_gen, AO_PROP_DISCARD_BUFFERS, 1); +- } + /* make sure there are no more buffers on queue */ + fifo_wait_empty(this->out_fifo); + } | ||
[+] | Added | vdr-xine-lib-0.8.1.diff ^ |
@@ -0,0 +1,4357 @@ +diff -uNr xine-lib-1.1.9.orig/configure.ac xine-lib-1.1.9/configure.ac +--- xine-lib-1.1.9.orig/configure.ac 2008-01-04 19:02:22.000000000 +0100 ++++ xine-lib-1.1.9/configure.ac 2008-01-07 19:59:25.000000000 +0100 +@@ -2720,6 +2720,7 @@ + src/video_out/vidix/drivers/Makefile + src/xine-utils/Makefile + src/xine-engine/Makefile ++src/vdr/Makefile + win32/Makefile + win32/include/Makefile]) + AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) +@@ -2762,7 +2763,7 @@ + echo " - stdin_fifo - rtp" + echo " - http - mms" + echo " - pnm - rtsp" +-echo " - dvb" ++echo " - dvb - vdr" + if test "x$external_dvdnav" = "xyes"; then + echo " - dvd (external libs)" + else +@@ -2967,6 +2968,7 @@ + echo " - eq - eq2" + echo " - boxblur - denoise3d" + echo " - unsharp - tvtime" ++echo " - vdr" + echo " * SFX:" + echo " - goom - oscope" + echo " - fftscope - mosaico" +diff -uNr xine-lib-1.1.9.orig/src/Makefile.am xine-lib-1.1.9/src/Makefile.am +--- xine-lib-1.1.9.orig/src/Makefile.am 2007-08-19 01:36:44.000000000 +0200 ++++ xine-lib-1.1.9/src/Makefile.am 2008-01-07 19:59:25.000000000 +0100 +@@ -26,4 +26,5 @@ + libfaad \ + libmusepack \ + post \ +- combined ++ combined \ ++ vdr +diff -uNr xine-lib-1.1.9.orig/src/vdr/combined_vdr.c xine-lib-1.1.9/src/vdr/combined_vdr.c +--- xine-lib-1.1.9.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.9/src/vdr/combined_vdr.c 2008-01-07 19:59:26.000000000 +0100 +@@ -0,0 +1,44 @@ ++/* ++ * Copyright (C) 2000-2004 the xine project ++ * ++ * This file is part of xine, a free video player. ++ * ++ * xine is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * xine is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA ++ */ ++ ++/* ++ * plugins for VDR ++ */ ++ ++#include "xine_internal.h" ++#include "post.h" ++#include "combined_vdr.h" ++ ++ ++ ++static const post_info_t vdr_video_special_info = { XINE_POST_TYPE_VIDEO_FILTER }; ++static const post_info_t vdr_audio_special_info = { XINE_POST_TYPE_AUDIO_FILTER }; ++ ++/* exported plugin catalog entry */ ++const plugin_info_t xine_plugin_info[] EXPORTED = ++{ ++ /* type , API, "name" , version , special_info , init_function */ ++ { PLUGIN_INPUT, 17, "VDR" , XINE_VERSION_CODE, NULL , &vdr_input_init_plugin }, ++ { PLUGIN_POST , 9, "vdr" , XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin }, ++ { PLUGIN_POST , 9, "vdr_video", XINE_VERSION_CODE, &vdr_video_special_info, &vdr_video_init_plugin }, ++ { PLUGIN_POST , 9, "vdr_audio", XINE_VERSION_CODE, &vdr_audio_special_info, &vdr_audio_init_plugin }, ++ { PLUGIN_NONE , 0, "" , 0 , NULL , NULL } ++}; ++ +diff -uNr xine-lib-1.1.9.orig/src/vdr/combined_vdr.h xine-lib-1.1.9/src/vdr/combined_vdr.h +--- xine-lib-1.1.9.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.9/src/vdr/combined_vdr.h 2008-01-07 19:59:26.000000000 +0100 +@@ -0,0 +1,92 @@ ++/* ++ * Copyright (C) 2000-2004 the xine project ++ * ++ * This file is part of xine, a free video player. ++ * ++ * xine is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * xine is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA ++ */ ++ ++#ifndef __COMBINED_VDR_H ++#define __COMBINED_VDR_H ++ ++ ++ ++typedef struct vdr_set_video_window_data_s { ++ int32_t x; ++ int32_t y; ++ int32_t w; ++ int32_t h; ++ int32_t w_ref; ++ int32_t h_ref; ++ ++} vdr_set_video_window_data_t; ++ ++ ++ ++typedef struct vdr_frame_size_changed_data_s { ++ int32_t x; ++ int32_t y; ++ int32_t w; ++ int32_t h; ++ double r; ++ ++} vdr_frame_size_changed_data_t; ++ ++ ++ ++typedef struct vdr_select_audio_data_s { ++ uint8_t channels; ++ ++} vdr_select_audio_data_t; ++ ++ ++ ++inline static int vdr_is_vdr_stream(xine_stream_t *stream) ++{ ++ if (!stream ++ || !stream->input_plugin ++ || !stream->input_plugin->input_class) ++ { ++ return 0; ++ } ++ ++ { ++ input_class_t *input_class = stream->input_plugin->input_class; ++ ++ if (input_class->get_identifier) ++ { ++ const char *identifier = input_class->get_identifier(input_class); ++ if (identifier ++ && 0 == strcmp(identifier, "VDR")) ++ { ++ return 1; ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++ ++ ++/* plugin class initialization function */ ++void *vdr_input_init_plugin(xine_t *xine, void *data); ++void *vdr_video_init_plugin(xine_t *xine, void *data); ++void *vdr_audio_init_plugin(xine_t *xine, void *data); ++ ++ ++ ++#endif /* __COMBINED_VDR_H */ ++ +diff -uNr xine-lib-1.1.9.orig/src/vdr/input_vdr.c xine-lib-1.1.9/src/vdr/input_vdr.c +--- xine-lib-1.1.9.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100 ++++ xine-lib-1.1.9/src/vdr/input_vdr.c 2008-01-07 19:59:26.000000000 +0100 +@@ -0,0 +1,2084 @@ ++/* ++ * Copyright (C) 2003-2004 the xine project ++ * ++ * This file is part of xine, a free video player. ++ * ++ * xine is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * xine is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
Added | xine-lib-1.1.9.tar.bz2 ^ |