diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:52:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:52:04 +0100 |
commit | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /media-libs/xine-lib | |
parent | 6612a728ea11526a849618ec515ad57131d64416 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'media-libs/xine-lib')
-rw-r--r-- | media-libs/xine-lib/Manifest | 3 | ||||
-rw-r--r-- | media-libs/xine-lib/files/ffmpeg29.patch | 44 | ||||
-rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch | 25 | ||||
-rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch | 15 |
4 files changed, 0 insertions, 87 deletions
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 80b59032e7be..b5961779df79 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -1,7 +1,4 @@ -AUX ffmpeg29.patch 1861 BLAKE2B c4045b93f352ecec5668fce239a04108f273307d3221b0c2a48cac64ebc6d556b8bd5efdc7e12bbcd3b1783b28492a72c969fd257192064dc0e6a808eb74ad87 SHA512 3697cb1ab8801a1d091aead3e50837946e6d8f6c6329341ced40039ebb6ac68b6e186ff2bd2f2ec5d517e5ed45bfb61d0cd21921f255e1ad768c186faf75beca AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1cf09efe1e57774280af501abf1a4214785dc875d6ca68515d48ebad37a90184b2db922034705df83592e1479741f15e726 SHA512 13badc72163f41a14fa85d84cbc835a396ab2bc195125025962257de4a41925e29c74159c3941472334f9eb10feee4278ea96288201689d5fcc48c494940ceb9 -AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d06662659d59c8f15e0b378518117ba55b7ee5a5fd55cc8fb7c896e2cbc80d297fd1b89e8437c6278d7e442453779e5f933f930 SHA512 c3415c9a0f65ec35dcb59b6880905ae525c6cfc38a42578d96ac713a4426b642069613e4234903e46e852e8f33b4eeab3ffce3864ca672efe8170ae987121783 -AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c EBUILD xine-lib-1.2.9-r1.ebuild 5465 BLAKE2B 228635a52f9a391bfdefab38040eed72941bf7d3a01d5169fec82eab24c8ba1788856bda2c8c2746fd8143863d5df5da575035dc01b091c50f3d69d05e1eaaf5 SHA512 7bebed6e02042ecb0a22ad8fd73ecb42a7b38e84ef61d5cdd84264437121e86201404975e6a877aa234a2f7dfd755bf529a4a1b45d9ace33fcb30b003f49ee60 EBUILD xine-lib-1.2.9999.ebuild 5353 BLAKE2B cd2702c8604e9b9ec7cb0eba1df213df2860ae2a7f6a5404cd10ec20b819433e5fa6bfb45ce3f987c9323a44e71005c29008c12bad1c0711e03853b700c70412 SHA512 287424631d94d2f05e50bba16b53069a00aa28ae205e2b46514e8d4aea6800748c0710bc1755c0d8d007be3ab3af4ecafca537c9f9ead7c063ebce3168fe3b34 diff --git a/media-libs/xine-lib/files/ffmpeg29.patch b/media-libs/xine-lib/files/ffmpeg29.patch deleted file mode 100644 index a220483218c0..000000000000 --- a/media-libs/xine-lib/files/ffmpeg29.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c -=================================================================== ---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c -+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c -@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec - int got_frame; - float gain = this->class->gain; - if (!this->av_frame) -- this->av_frame = avcodec_alloc_frame (); -+ this->av_frame = av_frame_alloc (); - - consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); - if ((consumed >= 0) && got_frame) { -@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode - /* try to reset the wma decoder */ - if( this->decoder_ok ) { - #if AVAUDIO > 3 -- avcodec_free_frame (&this->av_frame); -+ av_frame_free (&this->av_frame); - #endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); -@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco - - if( this->context && this->decoder_ok ) { - #if AVAUDIO > 3 -- avcodec_free_frame (&this->av_frame); -+ av_frame_free (&this->av_frame); - #endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); -Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c -=================================================================== ---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c -+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c -@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl - this->stream = stream; - this->class = (ff_video_class_t *) class_gen; - -- this->av_frame = avcodec_alloc_frame(); -+ this->av_frame = av_frame_alloc(); - this->context = avcodec_alloc_context(); - this->context->opaque = this; - #if AVPALETTE == 1 diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch deleted file mode 100644 index cc17643d9c56..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.xine-project.org/show_bug.cgi?id=572 -https://bugs.gentoo.org/584640 - ---- xine-lib-1.2.6/m4/video_out.m4 -+++ xine-lib-1.2.6/m4/video_out.m4 -@@ -305,7 +305,7 @@ - dnl xcb - XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins]) - if test x"$with_xcb" != x"no"; then -- PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no]) -+ PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no]) - if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then - AC_MSG_ERROR([XCB support requested, but XCB not found]) - elif test x"$have_xcb" = x"yes"; then ---- xine-lib-1.2.6/src/video_out/Makefile.am -+++ xine-lib-1.2.6/src/video_out/Makefile.am -@@ -147,7 +147,7 @@ - xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS) - - xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD) --xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS) -+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS) - xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS) - - xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD) diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch deleted file mode 100644 index a7168d5b4506..000000000000 --- a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch +++ /dev/null @@ -1,15 +0,0 @@ -fix build w/newer glibc due to major/minor includes being dropped from sys/types.h - -https://bugs.gentoo.org/580012 -https://bugs.xine-project.org/show_bug.cgi?id=574 - ---- a/src/xine-utils/xine_check.c -+++ b/src/xine-utils/xine_check.c -@@ -55,6 +55,7 @@ - #include <dlfcn.h> - #include <sys/stat.h> - #include <sys/ioctl.h> -+#include <sys/sysmacros.h> - #include <sys/utsname.h> - #include <linux/major.h> - #include <linux/hdreg.h> |