[packages/xine-lib] - updated to 1.2.6 - updated win32-path patch - removed obsolete missing,smbclient,build,libdvdnav5
qboosh
qboosh at pld-linux.org
Thu Oct 8 18:06:52 CEST 2015
commit 34262260cd677bc2f1032782a6d670fb51475dec
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Oct 8 18:08:02 2015 +0200
- updated to 1.2.6
- updated win32-path patch
- removed obsolete missing,smbclient,build,libdvdnav5 patches
- partially updated x32 patch (needs check)
libdvdnav5.patch | 17 ------
smbclient.patch | 23 --------
x32.patch | 65 +++++++++++-----------
xine-lib-build.patch | 32 -----------
xine-lib-missing.patch | 138 ----------------------------------------------
xine-lib-win32-path.patch | 8 +--
xine-lib.spec | 38 ++++++++-----
7 files changed, 61 insertions(+), 260 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 2d25677..b47d5c6 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -39,24 +39,20 @@ Summary(ko.UTF-8): 공개 동영상 플레이어
Summary(pl.UTF-8): Odtwarzacz filmów
Summary(pt_BR.UTF-8): Xine, um player de video
Name: xine-lib
-Version: 1.2.3
-Release: 12
+Version: 1.2.6
+Release: 1
Epoch: 2
License: GPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
-# Source0-md5: 011def012e9db3dee06808b4580ccede
+# Source0-md5: 02ee3c2380273989b4b016903209e05e
Patch0: %{name}-nolibs.patch
Patch1: %{name}-win32-path.patch
Patch2: %{name}-sh.patch
Patch3: %{name}-ac.patch
# from DirectFB 1.7.0
Patch4: %{name}-vdpau-hooks.patch
-Patch5: %{name}-missing.patch
-Patch6: smbclient.patch
-Patch7: %{name}-build.patch
-Patch8: libdvdnav5.patch
-Patch9: x32.patch
+Patch5: x32.patch
URL: http://xine.sourceforge.net/
%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22}
%{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23}
@@ -97,12 +93,13 @@ BuildRequires: librsvg
%{?with_stk:BuildRequires: libstk-devel >= 0.2.0}
BuildRequires: libtheora-devel
BuildRequires: libtool >= 0:1.4.2-9
+BuildRequires: libv4l-devel
BuildRequires: libva-devel
BuildRequires: libva-glx-devel
BuildRequires: libva-x11-devel
BuildRequires: libvdpau-devel
-BuildRequires: libv4l-devel
BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 1.3.0
BuildRequires: libxcb-devel >= 1.0
BuildRequires: libxdg-basedir-devel >= 1
BuildRequires: optipng
@@ -132,7 +129,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
# based on libtool numbers
-%define xine_pluginsdir %{_libdir}/xine/plugins/2.3
+%define xine_pluginsdir %{_libdir}/xine/plugins/2.5
%define specflags -fomit-frame-pointer
@@ -298,6 +295,19 @@ XINE - libjpeg based JPEG image decoder plugin.
%description -n xine-decode-libjpeg -l pl.UTF-8
XINE - wtyczka dekodera obrazów JPEG opartego na libjpeg.
+%package -n xine-decode-libvpx
+Summary: XINE - WebM (VP8/VP9) video decoder
+Summary(pl.UTF-8): XINE - wtyczka dekodera obrazu WebM (VP8/VP9)
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: libvpx-devel >= 1.3.0
+
+%description -n xine-decode-libvpx
+XINE - WebM (VP8/VP9) video decoder.
+
+%description -n xine-decode-libvpx -l pl.UTF-8
+XINE - wtyczka dekodera obrazu WebM (VP8/VP9).
+
%package -n xine-decode-mad
Summary: XINE - MAD-based MP3 audio decoder plugin
Summary(pl.UTF-8): XINE - wtyczka dekodera dźwięku MP3 oparta na bibliotece MAD
@@ -958,10 +968,6 @@ XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%build
%{__gettextize}
@@ -1151,6 +1157,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_libjpeg.so
+%files -n xine-decode-libvpx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_libvpx.so
+
%files -n xine-decode-mad
%defattr(644,root,root,755)
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mad.so
diff --git a/libdvdnav5.patch b/libdvdnav5.patch
deleted file mode 100644
index b006470..0000000
--- a/libdvdnav5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xine-lib-1.2.3/m4/input.m4~ 2015-03-09 19:21:30.000000000 +0100
-+++ xine-lib-1.2.3/m4/input.m4 2015-03-09 19:42:52.059143679 +0100
-@@ -126,9 +126,11 @@
- dnl XXX: This could be cleaned up so that code does not have to ifdef so much
- XINE_ARG_WITH([external-dvdnav], [Use external dvdnav library (not recommended)])
- if test x"$with_external_dvdnav" != x"no"; then
-- ACX_PACKAGE_CHECK([DVDNAV], [0.1.9], [dvdnav-config],
-- [AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])],
-- [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])])
-+ no_dvdnav=no
-+ PKG_CHECK_MODULES([DVDNAV], [dvdnav >= 0.1.9], [], [no_dvdnav=yes])
-+ if test "$no_dvdnav" = 'no'; then
-+ AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])
-+ fi
- AC_CHECK_LIB([dvdread], [navRead_DSI], [DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread"], [])
- else
- AC_MSG_RESULT([Using included DVDNAV support])
diff --git a/smbclient.patch b/smbclient.patch
deleted file mode 100644
index a6bcfd6..0000000
--- a/smbclient.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- xine-lib-1.2.3/m4/input.m4~ 2012-02-09 00:41:11.000000000 +0100
-+++ xine-lib-1.2.3/m4/input.m4 2014-02-05 17:59:55.505504611 +0100
-@@ -79,8 +79,8 @@
- dnl libsmbclient
- XINE_ARG_ENABLE([samba], [Enable support for the Samba plugin])
- if test x"$enable_samba" != x"no"; then
-- AC_CHECK_LIB([smbclient], [smbc_init],
-- [AC_CHECK_HEADERS([libsmbclient.h], [have_samba=yes LIBSMBCLIENT_LIBS="-lsmbclient"])])
-+ PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient], [have_samba=yes])
-+ AC_SUBST(LIBSMBCLIENT_CFLAGS)
- AC_SUBST(LIBSMBCLIENT_LIBS)
- if test x"$hard_enable_samba" = x"yes" && test x"$have_samba" != x"yes"; then
- AC_MSG_ERROR([Samba support requested, but Samba not found])
---- xine-lib-1.2.3/src/input/Makefile.am~ 2012-06-30 20:02:39.000000000 +0200
-+++ xine-lib-1.2.3/src/input/Makefile.am 2014-02-05 18:01:03.505504119 +0100
-@@ -150,6 +150,7 @@
- xineplug_inp_gnome_vfs_la_CFLAGS = $(AM_CFLAGS) $(GNOME_VFS_CFLAGS)
-
- xineplug_inp_smb_la_SOURCES = input_smb.c
-+xineplug_inp_smb_la_CFLAGS = $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS)
- xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL)
-
- xineplug_inp_pvr_la_SOURCES = input_pvr.c
diff --git a/x32.patch b/x32.patch
index a6f38ac..047ebcf 100644
--- a/x32.patch
+++ b/x32.patch
@@ -9,35 +9,36 @@
# define REG_a "rax"
# define intarch_t int64_t
#else
---- xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame_template_sse2.c~ 2012-06-30 20:02:39.000000000 +0200
-+++ xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame_template_sse2.c 2015-03-09 20:01:38.315802192 +0100
-@@ -96,7 +96,7 @@
- int bottom_field, int second_field,
- int width, int height )
- {
--#if defined(ARCH_X86) || defined(ARCH_X86_64)
-+#if defined(ARCH_X86) || (defined(ARCH_X86_64) && !defined(__ILP32__))
- int Line;
- int stride = width * 2;
- register uint8_t* M1;
---- xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame.c~ 2012-05-26 22:49:59.000000000 +0200
-+++ xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame.c 2015-03-09 20:03:08.535801540 +0100
-@@ -59,6 +59,10 @@
- int bottom_field, int second_field, int width, int height )
-
- {
-+#if defined(ARCH_X86_64) && defined(__ILP32__)
-+ DeinterlaceGreedy2Frame_MMXEXT(output, outstride, data,
-+ bottom_field, second_field, width, height );
-+#else
- if (xine_mm_accel() & MM_ACCEL_X86_SSE2) {
- if (((uintptr_t)output & 15) || (outstride & 15) ||
- width & 7 ||
-@@ -82,6 +86,7 @@
- bottom_field, second_field, width, height );
- /* could fall back to 3dnow/mmx here too */
- }
-+#endif
- }
-
-
+# is it still needed?
+#--- xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame_template_sse2.c~ 2012-06-30 20:02:39.000000000 +0200
+#+++ xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame_template_sse2.c 2015-03-09 20:01:38.315802192 +0100
+#@@ -96,7 +96,7 @@
+# int bottom_field, int second_field,
+# int width, int height )
+# {
+#-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#+#if defined(ARCH_X86) || (defined(ARCH_X86_64) && !defined(__ILP32__))
+# int Line;
+# int stride = width * 2;
+# register uint8_t* M1;
+#--- xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame.c~ 2012-05-26 22:49:59.000000000 +0200
+#+++ xine-lib-1.2.3/src/post/deinterlace/plugins/greedy2frame.c 2015-03-09 20:03:08.535801540 +0100
+#@@ -59,6 +59,10 @@
+# int bottom_field, int second_field, int width, int height )
+#
+# {
+#+#if defined(ARCH_X86_64) && defined(__ILP32__)
+#+ DeinterlaceGreedy2Frame_MMXEXT(output, outstride, data,
+#+ bottom_field, second_field, width, height );
+#+#else
+# if (xine_mm_accel() & MM_ACCEL_X86_SSE2) {
+# if (((uintptr_t)output & 15) || (outstride & 15) ||
+# width & 7 ||
+#@@ -82,6 +86,7 @@
+# bottom_field, second_field, width, height );
+# /* could fall back to 3dnow/mmx here too */
+# }
+#+#endif
+# }
+#
+#
diff --git a/xine-lib-build.patch b/xine-lib-build.patch
deleted file mode 100644
index 9f0aa8b..0000000
--- a/xine-lib-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- xine-lib-1.2.3/./src/demuxers/demux_mod.c~ 2012-02-05 20:17:02.000000000 +0100
-+++ xine-lib-1.2.3/./src/demuxers/demux_mod.c 2014-10-07 19:13:38.738115012 +0200
-@@ -46,7 +46,7 @@
- #include <xine/xineutils.h>
- #include <xine/compat.h>
- #include <xine/demux.h>
--#include "modplug.h"
-+#include <libmodplug/modplug.h>
- #include "bswap.h"
-
- #define MOD_SAMPLERATE 44100
---- xine-lib-1.2.3/m4/video_out.m4~ 2013-03-21 18:59:49.000000000 +0100
-+++ xine-lib-1.2.3/m4/video_out.m4 2014-10-07 19:26:40.365551398 +0200
-@@ -77,7 +77,7 @@
- dnl Color AsCii Art
- XINE_ARG_WITH([caca], [enable support for CACA])
- if test x"$with_caca" != x"no"; then
-- PKG_CHECK_MODULES([CACA], [caca >= 0.99beta14 cucul >= 0.99beta14], [have_caca="yes"], [have_caca="no"])
-+ PKG_CHECK_MODULES([CACA], [caca >= 0.99beta14], [have_caca="yes"], [have_caca="no"])
- if test x"$hard_with_caca" = x"yes" && test x"$have_caca" != x"yes"; then
- AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
- fi
---- xine-lib-1.2.3/src/video_out/video_out_caca.c~ 2012-09-05 03:02:12.000000000 +0200
-+++ xine-lib-1.2.3/src/video_out/video_out_caca.c 2014-10-07 19:28:12.671270113 +0200
-@@ -34,7 +34,6 @@
- #include <sys/stat.h>
- #include <sys/mman.h>
- #include <sys/time.h>
--#include <cucul.h>
- #include <caca.h>
-
- #ifdef HAVE_FFMPEG_AVUTIL_H
diff --git a/xine-lib-missing.patch b/xine-lib-missing.patch
deleted file mode 100644
index 83a15ab..0000000
--- a/xine-lib-missing.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- xine-lib-1.2.3/src/xine-engine/accel_vaapi.h.orig 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.2.3/src/xine-engine/accel_vaapi.h 2013-07-20 18:26:54.064253047 +0200
-@@ -0,0 +1,135 @@
-+/*
-+ * Copyright (C) 2008 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
-+ *
-+ *
-+ * Common acceleration definitions for vaapi
-+ *
-+ *
-+ */
-+
-+#ifndef HAVE_XINE_ACCEL_VAAPI_H
-+#define HAVE_XINE_ACCEL_VAAPI_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <va/va_x11.h>
-+#include <pthread.h>
-+#ifdef HAVE_FFMPEG_AVUTIL_H
-+# include <avcodec.h>
-+#else
-+# include <libavcodec/avcodec.h>
-+#endif
-+
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+# define AVVIDEO 2
-+#else
-+# define AVVIDEO 1
-+# define pp_context pp_context_t
-+# define pp_mode pp_mode_t
-+#endif
-+
-+#define NUM_OUTPUT_SURFACES 22
-+
-+#define SURFACE_FREE 0
-+#define SURFACE_ALOC 1
-+#define SURFACE_RELEASE 2
-+#define SURFACE_RENDER 3
-+#define SURFACE_RENDER_RELEASE 5
-+
-+struct vaapi_equalizer {
-+ VADisplayAttribute brightness;
-+ VADisplayAttribute contrast;
-+ VADisplayAttribute hue;
-+ VADisplayAttribute saturation;
-+};
-+
-+typedef struct ff_vaapi_context_s ff_vaapi_context_t;
-+
-+struct ff_vaapi_context_s {
-+ VADisplay va_display;
-+ VAContextID va_context_id;
-+ VAConfigID va_config_id;
-+ int width;
-+ int height;
-+ int sw_width;
-+ int sw_height;
-+ int va_profile;
-+ unsigned int va_colorspace;
-+ VAImage va_subpic_image;
-+ VASubpictureID va_subpic_id;
-+ int va_subpic_width;
-+ int va_subpic_height;
-+ int is_bound;
-+ void *gl_surface;
-+ unsigned int soft_head;
-+ unsigned int valid_context;
-+ unsigned int va_head;
-+ unsigned int va_soft_head;
-+ vo_driver_t *driver;
-+ unsigned int last_sub_image_fmt;
-+ VASurfaceID last_sub_surface_id;
-+ struct vaapi_equalizer va_equalizer;
-+ VAImageFormat *va_image_formats;
-+ int va_num_image_formats;
-+ VAImageFormat *va_subpic_formats;
-+ int va_num_subpic_formats;
-+};
-+
-+typedef struct ff_vaapi_surface_s ff_vaapi_surface_t;
-+typedef struct vaapi_accel_s vaapi_accel_t;
-+
-+struct ff_vaapi_surface_s {
-+ unsigned int index;
-+ vaapi_accel_t *accel;
-+ VASurfaceID va_surface_id;
-+ unsigned int status;
-+};
-+
-+struct vaapi_accel_s {
-+ unsigned int index;
-+ vo_frame_t *vo_frame;
-+
-+#if AVVIDEO > 1
-+ int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
-+ int *got_picture_ptr, AVPacket *avpkt);
-+#else
-+ int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture,
-+ int *got_picture_ptr, uint8_t *buf, int buf_size);
-+#endif
-+ VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender);
-+ int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec);
-+ ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen);
-+ int (*guarded_render)(vo_frame_t *frame_gen);
-+ ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen);
-+ void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
-+ void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface);
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
diff --git a/xine-lib-win32-path.patch b/xine-lib-win32-path.patch
index 718da0e..91845de 100644
--- a/xine-lib-win32-path.patch
+++ b/xine-lib-win32-path.patch
@@ -1,9 +1,9 @@
---- xine-lib-1.1.17/src/libw32dll/common.c.orig 2009-11-30 21:55:55.000000000 +0100
-+++ xine-lib-1.1.17/src/libw32dll/common.c 2010-01-21 09:21:44.000000000 +0100
+--- xine-lib-1.2.6/src/libw32dll/common.c.orig 2015-10-07 18:08:58.268849455 +0200
++++ xine-lib-1.2.6/src/libw32dll/common.c 2015-10-07 18:13:02.622172569 +0200
@@ -6,9 +6,8 @@
DIR *dir;
- char *path, *cfgpath;
- char *listpath[] = { "",
+ const char *path, *cfgpath;
+ const char * const listpath[] = { "",
- "/usr/lib/codecs",
+ WIN32_PATH,
"/usr/local/lib/codecs",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xine-lib.git/commitdiff/34262260cd677bc2f1032782a6d670fb51475dec
More information about the pld-cvs-commit
mailing list