From 73aadc7f04d9a776b4cdbfc6847e74afb9928f3aee74db0f6fd98710d92ac77c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 5 Jun 2020 15:12:18 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=128 --- xine-lib-dec_info_real.patch | 43 +++++++++++++++++++++++++++++------- xine-lib.spec | 4 ++-- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/xine-lib-dec_info_real.patch b/xine-lib-dec_info_real.patch index e655f6a..65e18fa 100644 --- a/xine-lib-dec_info_real.patch +++ b/xine-lib-dec_info_real.patch @@ -1,13 +1,23 @@ --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.c -@@ -190,6 +190,15 @@ void *_x_real_codec_open(xine_stream_t * +@@ -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 */ @@ -31,20 +41,37 @@ #endif --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c -@@ -518,7 +518,3 @@ static const uint32_t audio_types[] = { - BUF_AUDIO_COOK, BUF_AUDIO_ATRK, /* BUF_AUDIO_14_4, BUF_AUDIO_28_8, */ BUF_AUDIO_SIPRO, 0 - }; - +@@ -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 -@@ -544,7 +544,3 @@ static const uint32_t supported_types[] - BUF_VIDEO_RV40, - 0 }; +@@ -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.spec b/xine-lib.spec index 13b5003..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