- Fix build with xine-lib-dec_info_real.patch

OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=127
This commit is contained in:
Olaf Hering 2020-06-05 15:04:25 +00:00 committed by Git OBS Bridge
parent 5a7eed3c10
commit 3c0ea3d9cf
3 changed files with 57 additions and 2 deletions

View File

@ -0,0 +1,51 @@
--- a/src/libreal/real_common.c
+++ b/src/libreal/real_common.c
@@ -190,6 +190,15 @@ void *_x_real_codec_open(xine_stream_t *
return NULL;
}
+static const decoder_info_t dec_info_realvideo = {
+ supported_types, /* supported types */
+ 7 /* priority */
+};
+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
@@ -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
};
-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 };
-const decoder_info_t dec_info_realvideo = {
- supported_types, /* supported types */
- 7 /* priority */
-};

View File

@ -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 <davejplater@gmail.com>

View File

@ -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.