Revision: 5868 Author: pebender Date: Mon Nov 30 19:33:31 2009 Log: - Updated packages X11/libva and X11/vdpau-video.
http://code.google.com/p/minimyth/source/detail?r=5868 Added: /trunk/gar-minimyth/script/X11/libva/files/301_vdpau_mpeg4.patch /trunk/gar-minimyth/script/X11/vdpau-video/files/vdpau-video-0.6.0-install.patch Deleted: /trunk/gar-minimyth/script/X11/vdpau-video/files/vdpau-video-0.5.2-install.patch Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/X11/libva/Makefile /trunk/gar-minimyth/script/X11/libva/checksums /trunk/gar-minimyth/script/X11/libva/files/300_sds_version.patch /trunk/gar-minimyth/script/X11/libva/files/391_compat.patch /trunk/gar-minimyth/script/X11/vdpau-video/Makefile /trunk/gar-minimyth/script/X11/vdpau-video/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/libva/files/301_vdpau_mpeg4.patch Mon Nov 30 19:33:31 2009 @@ -0,0 +1,26 @@ +commit 3c2d45290e1369083a27d53a5f94276c82512974 +Author: Gwenole Beauchesne <[email protected]> +Date: Mon Nov 23 12:21:24 2009 +0000 + + Add extra picture info fields for VDPAU/MPEG-4. + +diff --git a/src/va.h b/src/va.h +index fa34850..f89a5cb 100755 +--- a/src/va.h ++++ b/src/va.h +@@ -672,6 +672,7 @@ typedef struct _VAPictureParameterBufferMPEG4 + unsigned int quarter_sample : 1; + unsigned int data_partitioned : 1; + unsigned int reversible_vlc : 1; ++ unsigned int resync_marker_disable : 1; + } bits; + unsigned int value; + } vol_fields; +@@ -692,6 +693,7 @@ typedef struct _VAPictureParameterBufferMPEG4 + } vop_fields; + unsigned char vop_fcode_forward; + unsigned char vop_fcode_backward; ++ unsigned short vop_time_increment_resolution; + /* short header related */ + unsigned char num_gobs_in_vop; + unsigned char num_macroblocks_in_gob; ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/vdpau-video/files/vdpau-video-0.6.0-install.patch Mon Nov 30 19:33:31 2009 @@ -0,0 +1,22 @@ +diff -Naur vdpau-video-0.6.0-old/src/Makefile.am vdpau-video-0.6.0-new/src/Makefile.am +--- vdpau-video-0.6.0-old/src/Makefile.am 2009-11-27 02:36:49.000000000 -0800 ++++ vdpau-video-0.6.0-new/src/Makefile.am 2009-11-27 22:13:05.000000000 -0800 +@@ -67,6 +67,7 @@ + install-data-hook: + cd $(DESTDIR)$(LIBVA_DRIVERS_PATH) ; \ + for drv in $(DRIVERS); do \ ++ rm -f $${drv}_drv_video.so; \ + ln -s vdpau_drv_video.so $${drv}_drv_video.so; \ + done + +diff -Naur vdpau-video-0.6.0-old/src/Makefile.in vdpau-video-0.6.0-new/src/Makefile.in +--- vdpau-video-0.6.0-old/src/Makefile.in 2009-11-27 02:39:59.000000000 -0800 ++++ vdpau-video-0.6.0-new/src/Makefile.in 2009-11-27 22:13:05.000000000 -0800 +@@ -583,6 +583,7 @@ + install-data-hook: + cd $(DESTDIR)$(LIBVA_DRIVERS_PATH) ; \ + for drv in $(DRIVERS); do \ ++ rm -f $${drv}_drv_video.so; \ + ln -s vdpau_drv_video.so $${drv}_drv_video.so; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. ======================================= --- /trunk/gar-minimyth/script/X11/vdpau-video/files/vdpau-video-0.5.2-install.patch Thu Oct 15 07:56:27 2009 +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur vdpau-video-0.5.2-old/src/Makefile.am vdpau-video-0.5.2-new/src/Makefile.am ---- vdpau-video-0.5.2-old/src/Makefile.am 2009-10-15 05:06:04.000000000 -0700 -+++ vdpau-video-0.5.2-new/src/Makefile.am 2009-10-15 07:50:07.000000000 -0700 -@@ -66,6 +66,7 @@ - install-data-hook: - cd $(DESTDIR)$(LIBVA_DRIVERS_PATH) ; \ - for drv in $(DRIVERS); do \ -+ rm -f $${drv}_drv_video.so; \ - ln -s vdpau_drv_video.so $${drv}_drv_video.so; \ - done - -diff -Naur vdpau-video-0.5.2-old/src/Makefile.in vdpau-video-0.5.2-new/src/Makefile.in ---- vdpau-video-0.5.2-old/src/Makefile.in 2009-10-15 05:06:17.000000000 -0700 -+++ vdpau-video-0.5.2-new/src/Makefile.in 2009-10-15 07:50:07.000000000 -0700 -@@ -581,6 +581,7 @@ - install-data-hook: - cd $(DESTDIR)$(LIBVA_DRIVERS_PATH) ; \ - for drv in $(DRIVERS); do \ -+ rm -f $${drv}_drv_video.so; \ - ln -s vdpau_drv_video.so $${drv}_drv_video.so; \ - done - # Tell versions [3.59,3.63) of GNU make to not export all variables. ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Sat Nov 21 19:18:32 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Mon Nov 30 19:33:31 2009 @@ -5,7 +5,7 @@ MiniMyth release. For earlier changes see the yearly changelog files. -------------------------------------------------------------------------------- -Changes since 72 (2009-11-20): +Changes since 72 (2009-11-30): Current MythTV versions MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch svn 16082 and @@ -84,6 +84,7 @@ Updated utils/tcl. Updated X11/libva. Updated X11/libvdpau. + Updated X11/vdpau-video. Updated xorg-7.4/pixman. Updated xorg-7.4/xf86-input-evdev. Updated xorg-7.4/xinit. ======================================= --- /trunk/gar-minimyth/script/X11/libva/Makefile Sat Nov 21 07:47:53 2009 +++ /trunk/gar-minimyth/script/X11/libva/Makefile Mon Nov 30 19:33:31 2009 @@ -3,7 +3,7 @@ CATEGORIES = X11 MASTER_SITES = http://www.splitted-desktop.com/~gbeauchesne/$(GARNAME)/ MASTER_SITES += http://www.splitted-desktop.com/~gbeauchesne/libva/patches/ -DISTFILES = $(GARNAME)_$(GARVERSION)-1+sds8.tar.gz +DISTFILES = $(GARNAME)_$(GARVERSION)-1+sds9.tar.gz PATCHFILES = \ 033_g45_add_rgba_subpic.patch \ 034_g45_fix_return_for_unimpl.patch \ @@ -19,6 +19,7 @@ 203_fix_fglrx_detection.patch \ 204_check_ATIFGLEXTENSION.patch \ 300_sds_version.patch \ + 301_vdpau_mpeg4.patch \ 320_move_vaPutSurface_flags_def.patch \ 321_libva_glx.base.patch \ 322_libva_glx.patch \ ======================================= --- /trunk/gar-minimyth/script/X11/libva/checksums Sat Nov 21 07:47:53 2009 +++ /trunk/gar-minimyth/script/X11/libva/checksums Mon Nov 30 19:33:31 2009 @@ -1,4 +1,4 @@ -d962e1d1781a965c6638babd611289e0 download/libva_0.31.0-1+sds8.tar.gz +3c9b6d4f7a6f4738a9dffe5dd2c11030 download/libva_0.31.0-1+sds9.tar.gz bb99c6d5100d01259c8d8669c93ad088 download/033_g45_add_rgba_subpic.patch 5ad708dbb604560c6740e95223395822 download/034_g45_fix_return_for_unimpl.patch 3c3af5ad672da69a6fe784842df110bc download/035_g45_add_yv12_image_format.patch @@ -12,10 +12,11 @@ aec524f99270e4dd7509aa8f4f15cef0 download/108_drivers_path.patch d2e5886b4d9a843599e4445b1cbc8d0e download/203_fix_fglrx_detection.patch 3fcd800617d719996d7b48a9964dba1d download/204_check_ATIFGLEXTENSION.patch -0d59558147cfd1af9e0325d4537c477f download/300_sds_version.patch +b10fa667a25b3427eda312784bcee4c2 download/300_sds_version.patch +5d856453028db32fa8bb215707daca9d download/301_vdpau_mpeg4.patch 66141102c1bf04536d531a1fb6868e01 download/320_move_vaPutSurface_flags_def.patch 2101b107075c39b3de526a1fc0ef9429 download/321_libva_glx.base.patch cc5ed9ac8754f6e6a86f9c39a147b697 download/322_libva_glx.patch 038d1fd82bf385d438430f98155cd5a5 download/390_compat.base.patch -d8be8f6478804421ddf9707d585db206 download/391_compat.patch +10fff073763235a9abd4b9b056dd162d download/391_compat.patch 1a44f78482b9df68c2a1ab8b501ac82d download/392_compat.dso.patch ======================================= --- /trunk/gar-minimyth/script/X11/libva/files/300_sds_version.patch Thu Sep 10 20:27:10 2009 +++ /trunk/gar-minimyth/script/X11/libva/files/300_sds_version.patch Mon Nov 30 19:33:31 2009 @@ -13,7 +13,7 @@ [libva_major_version.libva_minor_version.libva_micro_version]) +# increase this number for each API change -+m4_define([libva_sds_version], [3]) ++m4_define([libva_sds_version], [4]) + # if the library source code has changed, increment revision m4_define([libva_lt_revision], [0]) ======================================= --- /trunk/gar-minimyth/script/X11/libva/files/391_compat.patch Thu Sep 10 20:27:10 2009 +++ /trunk/gar-minimyth/script/X11/libva/files/391_compat.patch Mon Nov 30 19:33:31 2009 @@ -1,3 +1,9 @@ +commit 2e7aa803a8547dfcde6e97ae2bb4a8bbdbb2634e +Author: Gwenole Beauchesne <[email protected]> +Date: Mon Nov 23 12:22:09 2009 +0000 + + Update compat code for VDPAU/MPEG-4 additions. + commit 30808b39d82cbf0c185052a2d2d5ed8a5fc065d1 Author: Gwenole Beauchesne <[email protected]> Date: Thu Sep 10 14:01:57 2009 +0000 @@ -72,10 +78,10 @@ diff --git a/src/va_compat.c b/src/va_compat.c new file mode 100644 -index 0000000..e83e314 +index 0000000..0bd7385 --- /dev/null +++ b/src/va_compat.c -@@ -0,0 +1,1170 @@ +@@ -0,0 +1,1171 @@ +/* + * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved. + * @@ -564,6 +570,7 @@ + switch (ctx->version_minor) { + case 29: INIT_TRANSLATE_FUNC(PictureParameter,MPEG4, 0,29); break; + case 30: INIT_TRANSLATE_FUNC(PictureParameter,MPEG4, 0,30); break; ++ case 31: INIT_TRANSLATE_FUNC(PictureParameter,MPEG4, 0,31); break; + } + } + break; @@ -1248,10 +1255,10 @@ +} diff --git a/src/va_compat.h b/src/va_compat.h new file mode 100644 -index 0000000..e2b32ee +index 0000000..2c9d801 --- /dev/null +++ b/src/va_compat.h -@@ -0,0 +1,1420 @@ +@@ -0,0 +1,1467 @@ +/* + * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved. + * @@ -1899,6 +1906,53 @@ + } slice_flags; +} VAEncSliceParameterBuffer_0_30; + ++/* MPEG-4 Picture Parameter Buffer (0.31) */ ++typedef struct _VAPictureParameterBufferMPEG4_0_31 ++{ ++ unsigned short vop_width; ++ unsigned short vop_height; ++ VASurfaceID forward_reference_picture; ++ VASurfaceID backward_reference_picture; ++ union { ++ struct { ++ unsigned int short_video_header : 1; ++ unsigned int chroma_format : 2; ++ unsigned int interlaced : 1; ++ unsigned int obmc_disable : 1; ++ unsigned int sprite_enable : 2; ++ unsigned int sprite_warping_accuracy : 2; ++ unsigned int quant_type : 1; ++ unsigned int quarter_sample : 1; ++ unsigned int data_partitioned : 1; ++ unsigned int reversible_vlc : 1; ++ } bits; ++ unsigned int value; ++ } vol_fields; ++ unsigned char no_of_sprite_warping_points; ++ short sprite_trajectory_du[3]; ++ short sprite_trajectory_dv[3]; ++ unsigned char quant_precision; ++ union { ++ struct { ++ unsigned int vop_coding_type : 2; ++ unsigned int backward_reference_vop_coding_type : 2; ++ unsigned int vop_rounding_type : 1; ++ unsigned int intra_dc_vlc_thr : 3; ++ unsigned int top_field_first : 1; ++ unsigned int alternate_vertical_scan_flag : 1; ++ } bits; ++ unsigned int value; ++ } vop_fields; ++ unsigned char vop_fcode_forward; ++ unsigned char vop_fcode_backward; ++ /* short header related */ ++ unsigned char num_gobs_in_vop; ++ unsigned char num_macroblocks_in_gob; ++ /* for direct mode prediction */ ++ short TRB; ++ short TRD; ++} VAPictureParameterBufferMPEG4_0_31; ++ +typedef struct VADriverContext_0_29 *VADriverContextP_0_29; + +/* Driver VTable (0.29) */ @@ -2674,7 +2728,7 @@ +#endif /* VA_COMPAT_H */ diff --git a/src/va_compat_template.h b/src/va_compat_template.h new file mode 100644 -index 0000000..a652af6 +index 0000000..18349de --- /dev/null +++ b/src/va_compat_template.h @@ -0,0 +1,539 @@ @@ -3080,6 +3134,7 @@ + + return VA_STATUS_SUCCESS; +} ++#endif + +static VAStatus TRANSLATE(PictureParameter,MPEG4)( + VACompatContextP ctx, @@ -3125,7 +3180,6 @@ + + return VA_STATUS_SUCCESS; +} -+#endif + +#if COMPAT_MAJOR == 0 && COMPAT_MINOR == 30 +static VAStatus TRANSLATE_(VAEncSliceParameterBuffer)( ======================================= --- /trunk/gar-minimyth/script/X11/vdpau-video/Makefile Thu Oct 15 07:51:41 2009 +++ /trunk/gar-minimyth/script/X11/vdpau-video/Makefile Mon Nov 30 19:33:31 2009 @@ -1,5 +1,5 @@ GARNAME = vdpau-video -GARVERSION = 0.5.2 +GARVERSION = 0.6.0 CATEGORIES = X11 MASTER_SITES = http://www.splitted-desktop.com/~gbeauchesne/$(GARNAME)/ MASTER_SITES += http://www.splitted-desktop.com/~gbeauchesne/$(GARNAME)/patches/ @@ -18,6 +18,9 @@ INSTALL_SCRIPTS = $(WORKSRC)/Makefile CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \ + --enable-glx \ + --disable-debug \ + --disable-tracer \ --disable-static \ --enable-shared \ --with-gnu-ld ======================================= --- /trunk/gar-minimyth/script/X11/vdpau-video/checksums Thu Oct 15 07:51:41 2009 +++ /trunk/gar-minimyth/script/X11/vdpau-video/checksums Mon Nov 30 19:33:31 2009 @@ -1,2 +1,2 @@ -fc88b793d35c4389752a8331a9201778 download/vdpau-video-0.5.2.tar.gz -3ec15404115eb2c60d6a42ffce904f92 download/vdpau-video-0.5.2-install.patch +3bc9c8ecb834f3b815688580932956e6 download/vdpau-video-0.6.0.tar.gz +171729e034de20ff91b449240b17a87a download/vdpau-video-0.6.0-install.patch -- 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.
