commit: 6c5a9d003f2bad313c768c7c55bbd6578fe4c8e5 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Aug 15 10:25:00 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Fri Aug 18 14:17:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5a9d00
media-video/cinelerra: remove unused patches .../cinelerra/files/cinelerra-asm-gcc52.patch | 15 -- .../cinelerra/files/cinelerra-ffmpeg-0.11.patch | 156 --------------------- .../cinelerra/files/cinelerra-nofindobject.patch | 16 --- .../cinelerra/files/cinelerra-std_and_str_h.patch | 81 ----------- .../cinelerra/files/cinelerra-underlinking.patch | 15 -- 5 files changed, 283 deletions(-) diff --git a/media-video/cinelerra/files/cinelerra-asm-gcc52.patch b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch deleted file mode 100644 index 1f46ad2afa9..00000000000 --- a/media-video/cinelerra/files/cinelerra-asm-gcc52.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=562208 - -Index: cinelerra-20140710/quicktime/mmx.h -=================================================================== ---- cinelerra-20140710.orig/quicktime/mmx.h -+++ cinelerra-20140710/quicktime/mmx.h -@@ -102,7 +102,7 @@ typedef union { - * are unused by Cinelerra CV. Inspired by change found in - * <URL: http://hg.libsdl.org/SDL/file/32f0f603a0c8/src/video/mmx.h > - */ --#if !defined(__clang__) -+#if 0 - /* Function to test if multimedia instructions are supported... - */ - inline extern int diff --git a/media-video/cinelerra/files/cinelerra-ffmpeg-0.11.patch b/media-video/cinelerra/files/cinelerra-ffmpeg-0.11.patch deleted file mode 100644 index 6d59cc8408e..00000000000 --- a/media-video/cinelerra/files/cinelerra-ffmpeg-0.11.patch +++ /dev/null @@ -1,156 +0,0 @@ -Let it build with ffmpeg-0.11 - -Index: cinelerra-20111223/cinelerra/ffmpeg.C -=================================================================== ---- cinelerra-20111223.orig/cinelerra/ffmpeg.C -+++ cinelerra-20111223/cinelerra/ffmpeg.C -@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) { - - int FFMPEG::init(char *codec_string) { - -- avcodec_init(); - avcodec_register_all(); - - CodecID id = codec_id(codec_string); -Index: cinelerra-20111223/cinelerra/fileac3.C -=================================================================== ---- cinelerra-20111223.orig/cinelerra/fileac3.C -+++ cinelerra-20111223/cinelerra/fileac3.C -@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr) - - if(wr) - { -- avcodec_init(); - avcodec_register_all(); - codec = avcodec_find_encoder(CODEC_ID_AC3); - if(!codec) -Index: cinelerra-20111223/configure.in -=================================================================== ---- cinelerra-20111223.orig/configure.in -+++ cinelerra-20111223/configure.in -@@ -338,7 +338,7 @@ AC_SUBST(CPU_CFLAGS) - AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library])) - - if test "x$with_external_ffmpeg" = "xyes"; then -- PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc]) -+ PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil]) - FFMPEG_FOLDER="" - FFMPEG_EXTERNALTEXT="External ffmpeg" - -@@ -356,10 +356,10 @@ if test "x$with_external_ffmpeg" = "xyes - AC_MSG_RESULT($enable_ffmpeg_swscale) - if test x"$enable_ffmpeg_swscale" = xyes; then - dnl AC_DEFINE(HAVE_SWSCALER) -- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale]) -+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale libavutil]) - FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec -I/usr/include/libswscale -DHAVE_SWSCALER" - else -- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc]) -+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil]) - fi - FFMPEG_EXTERNALTEXT="External ffmpeg" - else -Index: cinelerra-20111223/quicktime/mpeg4.c -=================================================================== ---- cinelerra-20111223.orig/quicktime/mpeg4.c -+++ cinelerra-20111223/quicktime/mpeg4.c -@@ -8,6 +8,7 @@ - - - #include "libavcodec/avcodec.h" -+#include "libavutil/dict.h" - #include "colormodels.h" - #include "funcprotos.h" - #include "qtffmpeg.h" -@@ -624,12 +625,12 @@ static int encode(quicktime_t *file, uns - else - // ffmpeg section - { -+ AVDictionary ** opts = NULL; - static char *video_rc_eq="tex^qComp"; - codec->encode_initialized[current_field] = 1; - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -673,8 +674,10 @@ static int encode(quicktime_t *file, uns - context->b_quant_offset = 1.25; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - context->error_resilience = FF_ER_CAREFUL; --#else -+#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0) - context->error_recognition = FF_ER_CAREFUL; -+#else -+ context->err_recognition |= AV_EF_CAREFUL; - #endif - context->error_concealment = 3; - context->frame_skip_cmp = FF_CMP_DCTMAX; -@@ -699,7 +702,7 @@ static int encode(quicktime_t *file, uns - context->profile= FF_PROFILE_UNKNOWN; - context->rc_buffer_aggressivity = 1.0; - context->level= FF_LEVEL_UNKNOWN; -- context->flags |= CODEC_FLAG_H263P_UMV; -+ av_dict_set(opts, "umv", "1", 0); - context->flags |= CODEC_FLAG_AC_PRED; - - // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg... -@@ -717,10 +720,8 @@ static int encode(quicktime_t *file, uns - (codec->ffmpeg_id == CODEC_ID_MPEG4 || - codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO || - codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO || -- codec->ffmpeg_id == CODEC_ID_H263P || -- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) -+ codec->ffmpeg_id == CODEC_ID_H263P )) - { -- avcodec_thread_init(context, file->cpus); - context->thread_count = file->cpus; - } - -@@ -740,7 +741,7 @@ static int encode(quicktime_t *file, uns - * codec->fix_bitrate, - * codec->quantizer); - */ -- avcodec_open(context, codec->encoder[current_field]); -+ avcodec_open2(context, codec->encoder[current_field], opts); - - avcodec_get_frame_defaults(&codec->picture[current_field]); - -Index: cinelerra-20111223/quicktime/qtffmpeg.c -=================================================================== ---- cinelerra-20111223.orig/quicktime/qtffmpeg.c -+++ cinelerra-20111223/quicktime/qtffmpeg.c -@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg - (ffmpeg_id == CODEC_ID_MPEG4 || - ffmpeg_id == CODEC_ID_MPEG1VIDEO || - ffmpeg_id == CODEC_ID_MPEG2VIDEO || -- ffmpeg_id == CODEC_ID_H263P || -- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) -+ ffmpeg_id == CODEC_ID_H263P )) - { -- avcodec_thread_init(context, cpus); - context->thread_count = cpus; - } - if(avcodec_open(context, -Index: cinelerra-20111223/quicktime/wma.c -=================================================================== ---- cinelerra-20111223.orig/quicktime/wma.c -+++ cinelerra-20111223/quicktime/wma.c -@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_m - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - diff --git a/media-video/cinelerra/files/cinelerra-nofindobject.patch b/media-video/cinelerra/files/cinelerra-nofindobject.patch deleted file mode 100644 index 99acf2b643c..00000000000 --- a/media-video/cinelerra/files/cinelerra-nofindobject.patch +++ /dev/null @@ -1,16 +0,0 @@ -Depends on features removed in opencv3. -https://bugs.gentoo.org/show_bug.cgi?id=554516 - -Index: cinelerra-20140710/configure.ac -=================================================================== ---- cinelerra-20140710.orig/configure.ac -+++ cinelerra-20140710/configure.ac -@@ -317,7 +317,7 @@ fi - AC_DEFINE_UNQUOTED(HAVE_OPENCV_SURF, $HAVE_OPENCV_SURF, - [define if SURF support is compiled into opencv]) - if test "x$opencv" = "xyes" && test "x$opencvh" = "xyes" ; then -- enable_findobject=ok -+ enable_findobject=no - fi - AM_CONDITIONAL(ENABLE_FINDOBJECT,test "x$enable_findobject" = "xok") - ############## END OF MISC LIBRARIES diff --git a/media-video/cinelerra/files/cinelerra-std_and_str_h.patch b/media-video/cinelerra/files/cinelerra-std_and_str_h.patch deleted file mode 100644 index 2f8801ee087..00000000000 --- a/media-video/cinelerra/files/cinelerra-std_and_str_h.patch +++ /dev/null @@ -1,81 +0,0 @@ -Include required headers for free(), memcpy(), strcpy(), bcopy(), and more -Thanks to Martin von Gagern for reporting and initial patch -See, http://bugs.gentoo.org/show_bug.cgi?id=465478 - ---- cinelerra/vdevicebuz.C -+++ cinelerra/vdevicebuz.C -@@ -49,6 +49,8 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - #include <unistd.h> -+#include <string.h> -+#include <strings.h> - - #define BASE_VIDIOCPRIVATE 192 - ---- cinelerra/videodevice.C -+++ cinelerra/videodevice.C -@@ -53,6 +53,7 @@ - - #include <unistd.h> - #include <fcntl.h> -+#include <string.h> - - KeepaliveThread::KeepaliveThread(VideoDevice *device) - : Thread() ---- libmpeg3/audio/ac3.c -+++ libmpeg3/audio/ac3.c -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #include <stdint.h> - #include <stdio.h> - ---- libmpeg3/audio/layer3.c -+++ libmpeg3/audio/layer3.c -@@ -4,6 +4,7 @@ - #include "tables.h" - - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - - struct gr_info_s ---- mplexlo/mplex.c -+++ mplexlo/mplex.c -@@ -1,6 +1,6 @@ - #include <stdio.h> - #include <stdlib.h> -- -+#include <string.h> - - #include "libmpeg3.h" - #include "mpeg3protos.h" ---- quicktime/graphics.c -+++ quicktime/graphics.c -@@ -1,5 +1,6 @@ - #include "graphics.h" - -+#include <stdlib.h> - #include <string.h> - - /* Graphics acceleration routines */ ---- quicktime/libmjpeg.c -+++ quicktime/libmjpeg.c -@@ -17,6 +17,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include "colormodels.h" - #include "libmjpeg.h" - ---- quicktime/qtpng.c -+++ quicktime/qtpng.c -@@ -1,6 +1,7 @@ - #include "colormodels.h" - #include "funcprotos.h" - #include <png.h> -+#include <string.h> - #include "quicktime.h" - #include "qtpng.h" - diff --git a/media-video/cinelerra/files/cinelerra-underlinking.patch b/media-video/cinelerra/files/cinelerra-underlinking.patch deleted file mode 100644 index 1411d57cccd..00000000000 --- a/media-video/cinelerra/files/cinelerra-underlinking.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/367509 - -pluginserver.C is using dlsym, dlopen, dlclose and dlerror - ---- cinelerra/Makefile.am -+++ cinelerra/Makefile.am -@@ -685,6 +685,7 @@ - $(FIREWIRE_LDFLAGS) \ - $(LIBDV_LIBS) \ - -luuid \ -- $(MJPEG_LIBS) -+ $(MJPEG_LIBS) \ -+ -ldl - - EXTRA_DIST = gen-feather-h
