diff --git a/compat.c b/compat.c deleted file mode 100644 index dd0e33d..0000000 --- a/compat.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2010 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 - */ - -/* For compatibility with em8300 < 0.18.0 */ -int dxr3_compat_ioctl (int fd, int rq, void *arg) -{ - int ret = ioctl (fd, rq, arg); - if (ret < 0 && errno == EINVAL || errno == ENOTTY) - ret = ioctl (fd, rq & 0xFF, arg); - return ret; -} diff --git a/xine-lib-1.1.18-crippled.tar.bz2 b/xine-lib-1.1.18-crippled.tar.bz2 deleted file mode 100644 index aa100f7..0000000 --- a/xine-lib-1.1.18-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e0297228af8dd134dab60f45817b2ec581eb7786d41f760ab561751ac9bf41f -size 5116221 diff --git a/xine-lib-1.1.18-assert.patch b/xine-lib-1.1.18.1-assert.patch similarity index 100% rename from xine-lib-1.1.18-assert.patch rename to xine-lib-1.1.18.1-assert.patch diff --git a/xine-lib-1.1.18.1-crippled.tar.bz2 b/xine-lib-1.1.18.1-crippled.tar.bz2 new file mode 100644 index 0000000..55c5051 --- /dev/null +++ b/xine-lib-1.1.18.1-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b45a277f068b816fb65f9655235ee51c2c3d4875670ab6d82adbc77f223ef0 +size 5116260 diff --git a/xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch similarity index 100% rename from xine-lib-1.1.18-demuxcheckfor_mad_ffmpeg.patch rename to xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch diff --git a/xine-lib-1.1.18-glitch-free-pulseaudio.patch b/xine-lib-1.1.18.1-glitch-free-pulseaudio.patch similarity index 100% rename from xine-lib-1.1.18-glitch-free-pulseaudio.patch rename to xine-lib-1.1.18.1-glitch-free-pulseaudio.patch diff --git a/xine-lib-1.1.18-ia64-is-not-alpha.diff b/xine-lib-1.1.18.1-ia64-is-not-alpha.diff similarity index 100% rename from xine-lib-1.1.18-ia64-is-not-alpha.diff rename to xine-lib-1.1.18.1-ia64-is-not-alpha.diff diff --git a/xine-lib-1.1.18-install-plugins-helper.diff b/xine-lib-1.1.18.1-install-plugins-helper.diff similarity index 100% rename from xine-lib-1.1.18-install-plugins-helper.diff rename to xine-lib-1.1.18.1-install-plugins-helper.diff diff --git a/xine-lib-1.1.18-mjpegplugin.diff b/xine-lib-1.1.18.1-mjpegplugin.diff similarity index 100% rename from xine-lib-1.1.18-mjpegplugin.diff rename to xine-lib-1.1.18.1-mjpegplugin.diff diff --git a/xine-lib-1.1.18.1.tar.bz2 b/xine-lib-1.1.18.1.tar.bz2 new file mode 100644 index 0000000..08e545c --- /dev/null +++ b/xine-lib-1.1.18.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a9af8b928e7a65732fc256c6c092e4a74c554d19c977728f06baa1bda358311 +size 7530681 diff --git a/xine-lib-1.1.18.tar.bz2 b/xine-lib-1.1.18.tar.bz2 deleted file mode 100644 index 0af42ab..0000000 --- a/xine-lib-1.1.18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ba164c7a192b265a7c72bd623bd69b261bcf7716ecca90a08d67025dd16bfb7 -size 7533013 diff --git a/xine-lib.changes b/xine-lib.changes index 62eed31..225e979 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,5 +1,13 @@ ------------------------------------------------------------------- -Wed Feb 24 23:14:00 CEST 2010 - Manfred.Tremmel@iiv.de +Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de +- update to 1.1.18.1 + * Oops. compat.c (for DXR3 support) was omitted. + * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. + * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. + * Fix build with the old, outdated and deprecated internal ffmpeg. + +------------------------------------------------------------------- +Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel@iiv.de - update to 1.1.18 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix various problems with FLAC playback. @@ -16,7 +24,7 @@ Wed Feb 24 23:14:00 CEST 2010 - Manfred.Tremmel@iiv.de * Added support for WMA Pro. ------------------------------------------------------------------- -Wed Feb 03 21:03:00 CEST 2010 - Manfred.Tremmel@iiv.de +Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel@iiv.de - patches can't be build to work with crippled and non crippled tarball with fuzz=0, added "-F2" for patch 50 and 61 to fix this diff --git a/xine-lib.spec b/xine-lib.spec index 6167b40..9297360 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,5 +1,5 @@ # -# spec file for package xine-lib (Version 1.1.18) +# spec file for package xine-lib (Version 1.1.18.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -100,7 +100,7 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.18 +Version: 1.1.18.1 Release: 1 # bug437293 %ifarch ppc64 @@ -119,8 +119,6 @@ Source: xine-lib-%{version}.tar.bz2 %endif Source2: baselibs.conf Source10: README.SuSE -# missing file in 1.1.18 tarball -Source80: compat.c Source99: precheckin_cripple_tarball.sh # *** xine-lib: Bugfixes Patch26: xine-lib-doc-fix-X11R6.diff @@ -621,7 +619,6 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/ %else # Only apply to uncrippled source %patch80 -cp %{SOURCE80} src/dxr3/ %endif %patch72 -p1 %patch73 -p1