diff options
Diffstat (limited to 'abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch')
-rw-r--r-- | abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch b/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch deleted file mode 100644 index feaccfa..0000000 --- a/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch +++ /dev/null @@ -1,93 +0,0 @@ -Index: src/plugins/ffmpeg/ffmpeg.cpp -=================================================================== ---- src/plugins/ffmpeg/ffmpeg.cpp (revision 634) -+++ src/plugins/ffmpeg/ffmpeg.cpp (working copy) -@@ -2190,7 +2190,7 @@ - p=NULL; - for(p = av_codec_next(p); p != NULL; p = av_codec_next(p) ) { - #else -- for(p = first_avcodec; p != NULL; p = p->next) { -+ for(p = av_codec_next(NULL); p != NULL; p = p->next) { - #endif - - if((p2==NULL || strcmp(p->name, p2->name)<0) && -@@ -2269,7 +2269,7 @@ - } - avformat_opts = av_alloc_format_context(); - #ifdef HAVE_LIBSWSCALE -- sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); -+ sws_opts = sws_getContext(16,16,(PixelFormat)0, 16,16,(PixelFormat)0, sws_flags, NULL,NULL,NULL); - #endif - - -Index: src/plugins/ffmpeg/ffmpeg.h -=================================================================== ---- src/plugins/ffmpeg/ffmpeg.h (revision 634) -+++ src/plugins/ffmpeg/ffmpeg.h (working copy) -@@ -38,7 +38,7 @@ - #include <ctype.h> - #include <string.h> - --#if FFMPEG_VERSION >= 52 && !defined(OLD_INCLUDES_PATH) -+/* #if FFMPEG_VERSION >= 52 && !defined(OLD_INCLUDES_PATH) */ - #include <libavformat/avformat.h> - #include <libavutil/avutil.h> - #include <libavutil/fifo.h> -@@ -51,27 +51,27 @@ - #ifdef HAVE_AVSTRING_H - #include <libavutil/avstring.h> - #endif --#else -+/* #else - #include <avformat.h> - #include <avutil.h> - #include <fifo.h> -- #include <opt.h> -+ #include <opt.h> */ - - - #ifdef HAVE_LIBSWSCALE -- #include <swscale.h> -+ #include <libswscale/swscale.h> - #endif - - #ifdef HAVE_AVSTRING_H -- #include <avstring.h> -+ #include <libavutil/avstring.h> - #endif --#endif -+/* #endif */ - - - #include <math.h> - #include <stdlib.h> - #include <limits.h> -- //#include <mem.h> -+ //#include <mem.h> - - } - #endif // __cplusplus -Index: version.sh -=================================================================== ---- version.sh (revision 634) -+++ version.sh (working copy) -@@ -1,8 +1,15 @@ - #!/bin/sh - --svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` --test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2` --test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null` -+if [ "$1" == "" ] -+then -+DIR="." -+else -+DIR="$1" -+fi -+ -+svn_revision=`cd "$DIR" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -+test $svn_revision || svn_revision=`cd "$DIR" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2` -+test $svn_revision || svn_revision=`cd "$DIR" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null` - test $svn_revision || svn_revision=UNKNOWN - - NEW_REVISION="#define FUPPES_VERSION \"0.$svn_revision\"" - |