Revision: 5459 Author: pebender Date: Fri Sep 11 06:33:34 2009 Log: - Updated VLC VAAPI patch to account for API changes.
http://code.google.com/p/minimyth/source/detail?r=5459 Modified: /trunk/gar-minimyth/script/mediaplayers/vlc/checksums /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.1-vaapi.patch /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-snapshot-20090901-2221-vaapi.patch ======================================= --- /trunk/gar-minimyth/script/mediaplayers/vlc/checksums Thu Sep 3 19:28:06 2009 +++ /trunk/gar-minimyth/script/mediaplayers/vlc/checksums Fri Sep 11 06:33:34 2009 @@ -1,11 +1,11 @@ 6e299d373e7751bb36de001cdc6a2989 download/vlc-1.0.1.tar.bz2 ba27a70c96f804a7a4bc3cd740118d9d download/vlc-1.0.1-libgcrypt_m4.patch -d3cacbf48a51ee7138b89492758a9fcf download/vlc-1.0.1-vaapi.patch +18305aba604b6befbbcd59b4a43f1b8b download/vlc-1.0.1-vaapi.patch bee1f375f8fc7366fcdd35af8350005b download/vlc-1.0.1-vdpau_20090814.patch 6df687a0e979871c8b9ba97f0201ee8b download/vlc-1.0.1.patch.gar d002c116d34acd5266ceaef27976fb71 download/vlc-snapshot-20090901.tar.bz2 bc7024c997623b7529ef3bf07a6f74b6 download/vlc-snapshot-20090901-2221-libgcrypt_m4.patch -59b382732a1a27a40e0d7d02cc43456f download/vlc-snapshot-20090901-2221-vaapi.patch +48f64a7e5b17df10eb1a021c13330dd1 download/vlc-snapshot-20090901-2221-vaapi.patch a80d5198a3b225e09456c6fb66567b10 download/vlc-snapshot-20090901-2221-vdpau_20090814.patch 3620cfad72caf518fe694c0d7b8ab149 download/vlc-snapshot-20090901-2221.patch.gar ======================================= --- /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.1-vaapi.patch Thu Sep 3 01:11:04 2009 +++ /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-1.0.1-vaapi.patch Fri Sep 11 06:33:34 2009 @@ -1,6 +1,6 @@ diff -Naur vlc-1.0.1-old/configure.ac vlc-1.0.1-new/configure.ac --- vlc-1.0.1-old/configure.ac 2009-07-27 15:24:17.000000000 -0700 -+++ vlc-1.0.1-new/configure.ac 2009-09-02 21:29:04.000000000 -0700 ++++ vlc-1.0.1-new/configure.ac 2009-09-11 06:28:32.000000000 -0700 @@ -3102,8 +3102,8 @@ AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h) AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) @@ -14,7 +14,7 @@ AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.]) diff -Naur vlc-1.0.1-old/modules/codec/avcodec/avcodec.c vlc-1.0.1-new/modules/codec/avcodec/avcodec.c --- vlc-1.0.1-old/modules/codec/avcodec/avcodec.c 2009-05-08 17:10:48.000000000 -0700 -+++ vlc-1.0.1-new/modules/codec/avcodec/avcodec.c 2009-09-02 21:29:30.000000000 -0700 ++++ vlc-1.0.1-new/modules/codec/avcodec/avcodec.c 2009-09-11 06:28:32.000000000 -0700 @@ -129,6 +129,9 @@ add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT, @@ -27,7 +27,7 @@ /* encoder submodule */ diff -Naur vlc-1.0.1-old/modules/codec/avcodec/avcodec.h vlc-1.0.1-new/modules/codec/avcodec/avcodec.h --- vlc-1.0.1-old/modules/codec/avcodec/avcodec.h 2009-05-08 17:10:48.000000000 -0700 -+++ vlc-1.0.1-new/modules/codec/avcodec/avcodec.h 2009-09-02 21:29:30.000000000 -0700 ++++ vlc-1.0.1-new/modules/codec/avcodec/avcodec.h 2009-09-11 06:28:32.000000000 -0700 @@ -127,6 +127,9 @@ "usually has a detrimental effect on quality. However it provides a big " \ "speedup for high definition streams." ) @@ -47,7 +47,7 @@ +//#define HAVE_AVCODEC_VAAPI 1 diff -Naur vlc-1.0.1-old/modules/codec/avcodec/Modules.am vlc-1.0.1-new/modules/codec/avcodec/Modules.am --- vlc-1.0.1-old/modules/codec/avcodec/Modules.am 2009-05-08 17:10:48.000000000 -0700 -+++ vlc-1.0.1-new/modules/codec/avcodec/Modules.am 2009-09-02 21:29:30.000000000 -0700 ++++ vlc-1.0.1-new/modules/codec/avcodec/Modules.am 2009-09-11 06:28:32.000000000 -0700 @@ -7,6 +7,7 @@ avutil.h \ fourcc.c \ @@ -58,8 +58,8 @@ if ENABLE_SOUT diff -Naur vlc-1.0.1-old/modules/codec/avcodec/vaapi.c vlc-1.0.1-new/modules/codec/avcodec/vaapi.c --- vlc-1.0.1-old/modules/codec/avcodec/vaapi.c 1969-12-31 16:00:00.000000000 -0800 -+++ vlc-1.0.1-new/modules/codec/avcodec/vaapi.c 2009-09-02 21:29:30.000000000 -0700 -@@ -0,0 +1,487 @@ ++++ vlc-1.0.1-new/modules/codec/avcodec/vaapi.c 2009-09-11 06:29:16.000000000 -0700 +@@ -0,0 +1,492 @@ +/***************************************************************************** + * vaapi.c: VAAPI helpers for the ffmpeg decoder + ***************************************************************************** @@ -404,8 +404,13 @@ +{ + VASurfaceID i_surface_id = (VASurfaceID)(uintptr_t)p_ff->data[3]; + ++#if !VA_CHECK_VERSION(0,31,0) + if( vaSyncSurface( p_va->p_display, p_va->i_context_id, i_surface_id ) ) + return VLC_EGENERIC; ++#else ++ if( vaSyncSurface( p_va->p_display, i_surface_id ) ) ++ return VLC_EGENERIC; ++#endif + + /* XXX vaDeriveImage may be better but it is not supported by + * my setup. @@ -549,7 +554,7 @@ +#endif diff -Naur vlc-1.0.1-old/modules/codec/avcodec/vaapi.h vlc-1.0.1-new/modules/codec/avcodec/vaapi.h --- vlc-1.0.1-old/modules/codec/avcodec/vaapi.h 1969-12-31 16:00:00.000000000 -0800 -+++ vlc-1.0.1-new/modules/codec/avcodec/vaapi.h 2009-09-02 21:29:30.000000000 -0700 ++++ vlc-1.0.1-new/modules/codec/avcodec/vaapi.h 2009-09-11 06:28:32.000000000 -0700 @@ -0,0 +1,43 @@ +/***************************************************************************** + * vaapi.h: VAAPI helpers for the ffmpeg decoder @@ -596,7 +601,7 @@ +#endif diff -Naur vlc-1.0.1-old/modules/codec/avcodec/video.c vlc-1.0.1-new/modules/codec/avcodec/video.c --- vlc-1.0.1-old/modules/codec/avcodec/video.c 2009-07-21 14:33:28.000000000 -0700 -+++ vlc-1.0.1-new/modules/codec/avcodec/video.c 2009-09-02 21:29:30.000000000 -0700 ++++ vlc-1.0.1-new/modules/codec/avcodec/video.c 2009-09-11 06:28:32.000000000 -0700 @@ -34,10 +34,14 @@ #include <vlc_vout.h> #include <vlc_codecs.h> /* BITMAPINFOHEADER */ ======================================= --- /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-snapshot-20090901-2221-vaapi.patch Thu Sep 3 19:28:06 2009 +++ /trunk/gar-minimyth/script/mediaplayers/vlc/files/vlc-snapshot-20090901-2221-vaapi.patch Fri Sep 11 06:33:34 2009 @@ -1,6 +1,6 @@ diff -Naur vlc-1.1.0-git-old/configure.ac vlc-1.1.0-git-new/configure.ac --- vlc-1.1.0-git-old/configure.ac 2009-09-01 15:04:36.000000000 -0700 -+++ vlc-1.1.0-git-new/configure.ac 2009-09-02 22:51:17.000000000 -0700 ++++ vlc-1.1.0-git-new/configure.ac 2009-09-11 06:31:52.000000000 -0700 @@ -2852,8 +2852,8 @@ AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h) AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) @@ -12,3 +12,20 @@ VLC_RESTORE_FLAGS have_avcodec="yes" ],[ +diff -Naur vlc-1.1.0-git-old/modules/codec/avcodec/vaapi.c vlc-1.1.0-git-new/modules/codec/avcodec/vaapi.c +--- vlc-1.1.0-git-old/modules/codec/avcodec/vaapi.c 2009-09-01 15:04:37.000000000 -0700 ++++ vlc-1.1.0-git-new/modules/codec/avcodec/vaapi.c 2009-09-11 06:32:35.000000000 -0700 +@@ -344,8 +344,13 @@ + { + VASurfaceID i_surface_id = (VASurfaceID)(uintptr_t)p_ff->data[3]; + ++#if !VA_CHECK_VERSION(0,31,0) + if( vaSyncSurface( p_va->p_display, p_va->i_context_id, i_surface_id ) ) + return VLC_EGENERIC; ++#else ++ if( vaSyncSurface( p_va->p_display, i_surface_id ) ) ++ return VLC_EGENERIC; ++#endif + + /* XXX vaDeriveImage may be better but it is not supported by + * my setup. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
