diff --git a/xine-lib-dec_info_real.patch b/xine-lib-dec_info_real.patch new file mode 100644 index 0000000..65e18fa --- /dev/null +++ b/xine-lib-dec_info_real.patch @@ -0,0 +1,78 @@ +--- a/src/libreal/real_common.c ++++ b/src/libreal/real_common.c +@@ -190,6 +190,25 @@ void *_x_real_codec_open(xine_stream_t * + return NULL; + } + ++/* ++ * exported plugin catalog entry ++ */ ++static const uint32_t supported_types[] = { BUF_VIDEO_RV30, ++ BUF_VIDEO_RV40, ++ 0 }; ++static const decoder_info_t dec_info_realvideo = { ++ supported_types, /* supported types */ ++ 7 /* priority */ ++}; ++ ++static const uint32_t audio_types[] = { ++ BUF_AUDIO_COOK, BUF_AUDIO_ATRK, /* BUF_AUDIO_14_4, BUF_AUDIO_28_8, */ BUF_AUDIO_SIPRO, 0 ++ }; ++static const decoder_info_t dec_info_realaudio = { ++ audio_types, /* supported types */ ++ 6 /* priority */ ++}; ++ + const plugin_info_t xine_plugin_info[] EXPORTED = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec }, +--- a/src/libreal/real_common.h ++++ b/src/libreal/real_common.h +@@ -75,10 +75,8 @@ void *_x_real_codec_open(xine_stream_t * + const char *const codec_name, + const char *const codec_alternate); + +-const decoder_info_t dec_info_realvideo; + void *init_realvdec (xine_t *xine, const void *data); + +-const decoder_info_t dec_info_realaudio; + void *init_realadec (xine_t *xine, const void *data); + + #endif +--- a/src/libreal/xine_real_audio_decoder.c ++++ b/src/libreal/xine_real_audio_decoder.c +@@ -509,16 +509,3 @@ void *init_realadec (xine_t *xine, const + _x_real_codecs_init(xine); + return (audio_decoder_class_t *)&this; + } +- +-/* +- * exported plugin catalog entry +- */ +- +-static const uint32_t audio_types[] = { +- BUF_AUDIO_COOK, BUF_AUDIO_ATRK, /* BUF_AUDIO_14_4, BUF_AUDIO_28_8, */ BUF_AUDIO_SIPRO, 0 +- }; +- +-const decoder_info_t dec_info_realaudio = { +- audio_types, /* supported types */ +- 6 /* priority */ +-}; +--- a/src/libreal/xine_real_video_decoder.c ++++ b/src/libreal/xine_real_video_decoder.c +@@ -536,15 +536,3 @@ void *init_realvdec (xine_t *xine, const + return (video_decoder_class_t *)&this; + } + +-/* +- * exported plugin catalog entry +- */ +- +-static const uint32_t supported_types[] = { BUF_VIDEO_RV30, +- BUF_VIDEO_RV40, +- 0 }; +- +-const decoder_info_t dec_info_realvideo = { +- supported_types, /* supported types */ +- 7 /* priority */ +-}; diff --git a/xine-lib.changes b/xine-lib.changes index 23682fa..bda679e 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 15:15:15 UTC 2020 - olaf@aepfle.de + +- Fix build with xine-lib-dec_info_real.patch + ------------------------------------------------------------------- Sun Jan 26 14:11:29 UTC 2020 - Dave Plater diff --git a/xine-lib.spec b/xine-lib.spec index e6535a3..f0a78ff 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,7 +1,7 @@ # # spec file for package xine-lib # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -99,7 +99,7 @@ Release: 0 Summary: Video Player with Plug-Ins License: GPL-2.0-or-later AND SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Url: https://www.xine-project.org/ +URL: https://www.xine-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: http://sourceforge.net/projects/xine/files/%{name}/%{version}/%{name}-%{version}.tar.xz @@ -107,8 +107,7 @@ Source1: baselibs.conf Patch0: xine-lib-libdvdread_udf.diff Patch1: xine-lib-v4l-2.6.38.patch -#Patch2: xine-lib-contrib.patch -#Patch3: xine-lib-alsa.patch +Patch2: xine-lib-dec_info_real.patch # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch # This should be fixed upstream, but this patch will not work for them.