From b351576cba3c8fa4e4874884186d43adfae203ba Mon Sep 17 00:00:00 2001 From: Steve Dibb Date: Sat, 3 Feb 2007 13:30:04 +0000 Subject: [PATCH] Remove old patches Package-Manager: portage-2.1.1-r2 --- media-video/avidemux/Manifest | 20 +- .../files/avidemux-2.0.42-as-needed.patch | 23 -- .../avidemux/files/avidemux-altivec.patch | 253 ------------------ .../files/avidemux-extra-qualification.diff | 102 ------- 4 files changed, 4 insertions(+), 394 deletions(-) delete mode 100644 media-video/avidemux/files/avidemux-2.0.42-as-needed.patch delete mode 100644 media-video/avidemux/files/avidemux-altivec.patch delete mode 100644 media-video/avidemux/files/avidemux-extra-qualification.diff diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index bd1266c1e69c..4322ef164801 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,7 +1,3 @@ -AUX avidemux-2.0.42-as-needed.patch 2089 RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 SHA1 ff9e17c351b172f9c62ff0ffcb7a6e0836cd564e SHA256 c7d7b5c7d4d69543f09a9f9bceae867da4811cf3c917d8d9e13ee54f90b3284f -MD5 2827b9dff4e9519e37be7898ef7e84f7 files/avidemux-2.0.42-as-needed.patch 2089 -RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 files/avidemux-2.0.42-as-needed.patch 2089 -SHA256 c7d7b5c7d4d69543f09a9f9bceae867da4811cf3c917d8d9e13ee54f90b3284f files/avidemux-2.0.42-as-needed.patch 2089 AUX avidemux-2.3.0-amprogas.patch 284 RMD160 8c7c44296339f7f4fbae3d629d3e38cf63432756 SHA1 53127b1d07f7d8ceb04d7b92150f499234c4f06d SHA256 b93520061994ba223dede420a597fd3ba999021006893b3100e16649d41957d5 MD5 5e03fe5ad0e79f4a000cfbafdf28e1a6 files/avidemux-2.3.0-amprogas.patch 284 RMD160 8c7c44296339f7f4fbae3d629d3e38cf63432756 files/avidemux-2.3.0-amprogas.patch 284 @@ -22,23 +18,15 @@ AUX avidemux-2.3.0-twolame.patch 4288 RMD160 9b29ea6ef756901b8a017fd8376b201ccbf MD5 f1f673c0037bf089031ce97e31296698 files/avidemux-2.3.0-twolame.patch 4288 RMD160 9b29ea6ef756901b8a017fd8376b201ccbf7bda7 files/avidemux-2.3.0-twolame.patch 4288 SHA256 b14a123fa1c6c9a99dc7911050e0a6754dde05aec8862949bab3dda01f7b8350 files/avidemux-2.3.0-twolame.patch 4288 -AUX avidemux-altivec.patch 9371 RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 SHA1 4ac716eb8dffa2327c10d9d8927044790fae39f4 SHA256 74b2e5b86bbdf204636cbf1f339d339e14be1ef89f67b47cf3c2fd6fcad83bf2 -MD5 7709231a89b035414b4877681aa78dc1 files/avidemux-altivec.patch 9371 -RMD160 8347497a6888515169e80fb28cc5d768c8ef7b32 files/avidemux-altivec.patch 9371 -SHA256 74b2e5b86bbdf204636cbf1f339d339e14be1ef89f67b47cf3c2fd6fcad83bf2 files/avidemux-altivec.patch 9371 -AUX avidemux-extra-qualification.diff 4495 RMD160 ce1abd5c5bcf48f8ff5b1b1e8c10da468efc7dc7 SHA1 80795e05323756dc5f77ec8ac2061f2fa4e6050e SHA256 38bc81b39c6b2372c0b3bfa4b478da2b3f9975b4e2b9a0337ea295f02e9733a1 -MD5 46d22d8985e6bf1f0458c33a7002c51f files/avidemux-extra-qualification.diff 4495 -RMD160 ce1abd5c5bcf48f8ff5b1b1e8c10da468efc7dc7 files/avidemux-extra-qualification.diff 4495 -SHA256 38bc81b39c6b2372c0b3bfa4b478da2b3f9975b4e2b9a0337ea295f02e9733a1 files/avidemux-extra-qualification.diff 4495 DIST avidemux_2.3.0.tar.gz 4750919 RMD160 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e SHA1 40a51db22593d910224dac91b512489a6af499fb SHA256 ef083ab24e3ec612b10c8a0163845ff680fea845d5eade21d60d47e843b4c623 EBUILD avidemux-2.3.0.ebuild 3414 RMD160 5728bdcc5ec47c04c19652225a48d5baf178e0bc SHA1 ca79f64825b43b29fc6098a8253b8dc4981559cc SHA256 18ff6c4d29362f8679e1d2085f6c0d29563ca37851b0562db85c7cd46d33d149 MD5 f27c80b182701865e46d22bf9051c0b0 avidemux-2.3.0.ebuild 3414 RMD160 5728bdcc5ec47c04c19652225a48d5baf178e0bc avidemux-2.3.0.ebuild 3414 SHA256 18ff6c4d29362f8679e1d2085f6c0d29563ca37851b0562db85c7cd46d33d149 avidemux-2.3.0.ebuild 3414 -MISC ChangeLog 20131 RMD160 b26b9cc5dbfdd759a9c31e96b953e3a45afc531b SHA1 307ca73af8eaffb958bfacc97891dbfdf5dc4d07 SHA256 e90cabb91da3bc5d0ec76892f2e4b235b33c9ed8b7118bdbb56dc4997bc859d4 -MD5 979e9563ac15ee3ba7cc492d3f027dd0 ChangeLog 20131 -RMD160 b26b9cc5dbfdd759a9c31e96b953e3a45afc531b ChangeLog 20131 -SHA256 e90cabb91da3bc5d0ec76892f2e4b235b33c9ed8b7118bdbb56dc4997bc859d4 ChangeLog 20131 +MISC ChangeLog 20317 RMD160 d4b82f47308df6414afd1c2f37a7e95b715236d1 SHA1 942961797666277eb0f6be74dd07abb0f10f4c12 SHA256 0c8ae852df70d65ec5dd751ae8a9201def0fec86ca81ac7edbc5942e5d5b5565 +MD5 360f2b0b18a08a304af21bbacc9ca5d7 ChangeLog 20317 +RMD160 d4b82f47308df6414afd1c2f37a7e95b715236d1 ChangeLog 20317 +SHA256 0c8ae852df70d65ec5dd751ae8a9201def0fec86ca81ac7edbc5942e5d5b5565 ChangeLog 20317 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318 diff --git a/media-video/avidemux/files/avidemux-2.0.42-as-needed.patch b/media-video/avidemux/files/avidemux-2.0.42-as-needed.patch deleted file mode 100644 index 8d123cf7c5a6..000000000000 --- a/media-video/avidemux/files/avidemux-2.0.42-as-needed.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru avidemux-2.0.42-orig/avidemux/Makefile.am avidemux-2.0.42/avidemux/Makefile.am ---- avidemux-2.0.42-orig/avidemux/Makefile.am 2006-09-14 11:52:16.442677508 +0200 -+++ avidemux-2.0.42/avidemux/Makefile.am 2006-09-14 11:53:03.135209474 +0200 -@@ -3,9 +3,9 @@ - - ## INCLUDES were found outside kdevelop specific part - --avidemux2_SOURCES = gui_keyframes.cpp support.cpp guiplay.cpp gui_xv.cpp \ -+avidemux2_SOURCES = main.cpp gui_keyframes.cpp support.cpp guiplay.cpp gui_xv.cpp \ - gui_savenew.cpp gui_rgb.cpp gui_navigate.cpp gtk_gui.cpp callbacks.cpp avilist.cpp \ -- main.cpp prefs.cpp ADM_guiBitrate.cpp ADM_requantize.cpp ADM_pp.cpp \ -+ prefs.cpp ADM_guiBitrate.cpp ADM_requantize.cpp ADM_pp.cpp \ - ADM_memsupport.cpp - #avidemux_LDADD = ./ADM_library/libADM_library.a ./ADM_audio/libADM_audio.a ./ADM_audiocodec/libADM_audiocodec.a ./ADM_audiofilter/libADM_audiofilter.a ./ADM_codecs/libADM_codecs.a ./ADM_colorspace/libADM_colorspace.a ./ADM_editor/libADM_editor.a ./ADM_encoder/libADM_encoder.a ./ADM_filter/libADM_filter.a ../ADM_gui2/libADM_gui2.a /ADM_gui/libADM_gui.a ./ADM_inpics/libADM_inpics.a ./ADM_nuv/libADM_nuv.a ./ADM_toolkit/libADM_toolkit.a ./oplug_mpeg/liboplug_mpeg.a ./ADM_video/libADM_video.a ./oplug_avi/liboplug_avi.a ./ADM_audiodevice/libADM_audiodevice.a ./ADM_vp32/libADM_vp32.a ./ADM_mpeg2dec/libADM_mpeg2dec.a ./ADM_mpegindexer/libADM_mpegindexer.a ./libMpeg2Dec/liblibMpeg2Dec.a ./oplug_mpegFF/liboplug_mpegFF.a -L/usr/X11R6/lib -lm -lXext -lX11 - -@@ -62,6 +62,6 @@ - INCLUDES= $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) $(VORBIS_CFLAGS) $(LIBMAD_CFLAGS) -DADMLOCALE='"'$(ADM_LOCALEDIR)'"' - - # the library search path. --avidemux2_LDFLAGS = $(all_libraries) -L/usr/X11R6/lib $(SDL_LIBS) $(GTK_LIBS) $(FREETYPE_LIBS) $(ARTS_LIBS) $(XML_LIBS) $(VORBIS_LIBS) $(LIBMAD_LIBS) ../adm_lavcodec/libavcodec.a -lX11 -lXext -+avidemux2_LDADD += $(all_libraries) -L/usr/X11R6/lib $(SDL_LIBS) $(GTK_LIBS) $(FREETYPE_LIBS) $(ARTS_LIBS) $(XML_LIBS) $(VORBIS_LIBS) $(LIBMAD_LIBS) ../adm_lavcodec/libavcodec.a -lX11 -lXext - - noinst_HEADERS = ADM_pp.h admmangle.h diff --git a/media-video/avidemux/files/avidemux-altivec.patch b/media-video/avidemux/files/avidemux-altivec.patch deleted file mode 100644 index 0a3ea73c6ac9..000000000000 --- a/media-video/avidemux/files/avidemux-altivec.patch +++ /dev/null @@ -1,253 +0,0 @@ ---- avidemux/ADM_colorspace/yv12rgb_altivec.cpp.bak 2006-01-07 23:37:35.000000000 -0500 -+++ avidemux/ADM_colorspace/yv12rgb_altivec.cpp 2006-01-07 23:38:46.000000000 -0500 -@@ -53,9 +53,9 @@ - #define vecbyte vector unsigned char - #define vecshort vector unsigned short - --uint8_t altivecYV12RGB(uint8_t * ptr_y, -+void altivecYV12RGB(uint8_t * ptr_y, - uint8_t * ptr_u, -- uint8_t * ptr_v, uint8_t * ptr2, uint32_t w); -+ uint8_t * ptr_v, uint8_t * ptr2, int w); - - // A pack of constant vectors we will use later - // we more or less rely on gcc to have good register allocation -@@ -78,9 +78,9 @@ - // We handle 8 pixels at a time - // My first altivec code :) - //____________________________________ --uint8_t altivecYV12RGB(uint8_t * ptr_y, -+void altivecYV12RGB(uint8_t * ptr_y, - uint8_t * ptr_u, -- uint8_t * ptr_v, uint8_t * ptr2, uint32_t w) -+ uint8_t * ptr_v, uint8_t * ptr2, int w) - { - - vector unsigned char y,y2,u,v; -@@ -280,7 +280,7 @@ - - } - -- return 1; -+ return; - } - // - ---- avidemux/ADM_colorspace/yv2bmp.cpp.bak 2006-01-07 23:40:11.000000000 -0500 -+++ avidemux/ADM_colorspace/yv2bmp.cpp 2006-01-07 23:39:24.000000000 -0500 -@@ -29,9 +29,9 @@ - #include "colorspace.h" - #include "ADM_toolkit/ADM_cpuCap.h" - #ifdef HAVE_ALTIVEC --extern uint8_t altivecYV12RGB(uint8_t * ptr_y, -+extern void altivecYV12RGB(uint8_t * ptr_y, - uint8_t * ptr_u, -- uint8_t * ptr_v, uint8_t * ptr2, uint32_t w); -+ uint8_t * ptr_v, uint8_t * ptr2, int w); - #endif - - static void swapRnB (uint8_t * ptr, uint32_t w); ---- adm_lavcodec/libpostproc/postprocess_altivec_template.c.bak 2006-01-08 01:52:55.000000000 -0500 -+++ adm_lavcodec/libpostproc/postprocess_altivec_template.c 2006-01-08 01:52:14.000000000 -0500 -@@ -1228,12 +1228,12 @@ - - - -- const VECS16 vec_m=(VECS16)(0,1,2,3,3,2,1,0); -- const VECS16 vec_m2=(VECS16)(0,-1,0,2,0,-1,0,0); -- const VECS16 vec_sign=(VECS16)(0,1,1,1,-1,-1,-1,0); -- const VECS16 vec_sign2=(VECS16)(0,-1,-1,-1,1,1,1,0); -+ const VECS16 vec_m=(VECS16)AVV(0,1,2,3,3,2,1,0); -+ const VECS16 vec_m2=(VECS16)AVV(0,-1,0,2,0,-1,0,0); -+ const VECS16 vec_sign=(VECS16)AVV(0,1,1,1,-1,-1,-1,0); -+ const VECS16 vec_sign2=(VECS16)AVV(0,-1,-1,-1,1,1,1,0); - -- const VEC16 vec_const=(VEC16)(4,0x11,0xFFFF,0,0,0,0,0); -+ const VEC16 vec_const=(VEC16)AVV(4,0x11,0xFFFF,0,0,0,0,0); - - const VECS8 neg1=(VECS8)vec_splat(vec_const,2); // -1 - const VEC16 vec_shift=vec_splat(vec_const,0); // 3 ---- adm_lavcodec/libpostproc/postprocess_template.c.bak 2006-01-08 01:57:42.000000000 -0500 -+++ adm_lavcodec/libpostproc/postprocess_template.c 2006-01-08 01:54:45.000000000 -0500 -@@ -513,7 +513,7 @@ - - - -- const VEC16 vec_const=(VEC16)(4,0x11,0xFFFF,0,0,0,0,0); -+ const VEC16 vec_const=(VEC16)AVV(4,0x11,0xFFFF,0,0,0,0,0); - const VEC8 vec_zero=(VEC8)vec_splat(vec_const,3); //0 - const VEC16 neg1=vec_splat(vec_const,2); //FFFFF - const VEC16 vec_shift=vec_splat(vec_const,0); //4 ---- adm_lavcodec/ppc/fdct_altivec.c.bak 2006-07-08 16:51:08.000000000 -0400 -+++ adm_lavcodec/ppc/fdct_altivec.c 2006-07-08 18:04:23.000000000 -0400 -@@ -18,7 +18,7 @@ - */ - - --#include "../common.h" -+#include "common.h" - #include "../dsputil.h" - #include "dsputil_altivec.h" - #include "gcc_fixes.h" -@@ -214,8 +214,8 @@ - - /* setup constants {{{ */ - /* mzero = -0.0 */ -- vu32(mzero) = vec_splat_u32(-1); -- vu32(mzero) = vec_sl(vu32(mzero), vu32(mzero)); -+ mzero = ((vector float)vec_splat_u32(-1)); -+ mzero = ((vector float)vec_sl(vu32(mzero), vu32(mzero))); - cp = fdctconsts; - cnsts0 = vec_ld(0, cp); cp++; - cnsts1 = vec_ld(0, cp); cp++; -@@ -227,43 +227,43 @@ - #define MERGE_S16(hl,a,b) vec_merge##hl(vs16(a), vs16(b)) - - bp = (vector signed short*)block; -- vs16(b00) = vec_ld(0, bp); -- vs16(b40) = vec_ld(16*4, bp); -- vs16(b01) = MERGE_S16(h, b00, b40); -- vs16(b11) = MERGE_S16(l, b00, b40); -+ b00 = ((vector float)vec_ld(0, bp)); -+ b40 = ((vector float)vec_ld(16*4, bp)); -+ b01 = ((vector float)MERGE_S16(h, b00, b40)); -+ b11 = ((vector float)MERGE_S16(l, b00, b40)); - bp++; -- vs16(b10) = vec_ld(0, bp); -- vs16(b50) = vec_ld(16*4, bp); -- vs16(b21) = MERGE_S16(h, b10, b50); -- vs16(b31) = MERGE_S16(l, b10, b50); -+ b10 = ((vector float)vec_ld(0, bp)); -+ b50 = ((vector float)vec_ld(16*4, bp)); -+ b21 = ((vector float)MERGE_S16(h, b10, b50)); -+ b31 = ((vector float)MERGE_S16(l, b10, b50)); - bp++; -- vs16(b20) = vec_ld(0, bp); -- vs16(b60) = vec_ld(16*4, bp); -- vs16(b41) = MERGE_S16(h, b20, b60); -- vs16(b51) = MERGE_S16(l, b20, b60); -+ b20 = ((vector float)vec_ld(0, bp)); -+ b60 = ((vector float)vec_ld(16*4, bp)); -+ b41 = ((vector float)MERGE_S16(h, b20, b60)); -+ b51 = ((vector float)MERGE_S16(l, b20, b60)); - bp++; -- vs16(b30) = vec_ld(0, bp); -- vs16(b70) = vec_ld(16*4, bp); -- vs16(b61) = MERGE_S16(h, b30, b70); -- vs16(b71) = MERGE_S16(l, b30, b70); -- -- vs16(x0) = MERGE_S16(h, b01, b41); -- vs16(x1) = MERGE_S16(l, b01, b41); -- vs16(x2) = MERGE_S16(h, b11, b51); -- vs16(x3) = MERGE_S16(l, b11, b51); -- vs16(x4) = MERGE_S16(h, b21, b61); -- vs16(x5) = MERGE_S16(l, b21, b61); -- vs16(x6) = MERGE_S16(h, b31, b71); -- vs16(x7) = MERGE_S16(l, b31, b71); -- -- vs16(b00) = MERGE_S16(h, x0, x4); -- vs16(b10) = MERGE_S16(l, x0, x4); -- vs16(b20) = MERGE_S16(h, x1, x5); -- vs16(b30) = MERGE_S16(l, x1, x5); -- vs16(b40) = MERGE_S16(h, x2, x6); -- vs16(b50) = MERGE_S16(l, x2, x6); -- vs16(b60) = MERGE_S16(h, x3, x7); -- vs16(b70) = MERGE_S16(l, x3, x7); -+ b30 = ((vector float)vec_ld(0, bp)); -+ b70 = ((vector float)vec_ld(16*4, bp)); -+ b61 = ((vector float)MERGE_S16(h, b30, b70)); -+ b71 = ((vector float)MERGE_S16(l, b30, b70)); -+ -+ x0 = ((vector float)MERGE_S16(h, b01, b41)); -+ x1 = ((vector float)MERGE_S16(l, b01, b41)); -+ x2 = ((vector float)MERGE_S16(h, b11, b51)); -+ x3 = ((vector float)MERGE_S16(l, b11, b51)); -+ x4 = ((vector float)MERGE_S16(h, b21, b61)); -+ x5 = ((vector float)MERGE_S16(l, b21, b61)); -+ x6 = ((vector float)MERGE_S16(h, b31, b71)); -+ x7 = ((vector float)MERGE_S16(l, b31, b71)); -+ -+ b00 = ((vector float)MERGE_S16(h, x0, x4)); -+ b10 = ((vector float)MERGE_S16(l, x0, x4)); -+ b20 = ((vector float)MERGE_S16(h, x1, x5)); -+ b30 = ((vector float)MERGE_S16(l, x1, x5)); -+ b40 = ((vector float)MERGE_S16(h, x2, x6)); -+ b50 = ((vector float)MERGE_S16(l, x2, x6)); -+ b60 = ((vector float)MERGE_S16(h, x3, x7)); -+ b70 = ((vector float)MERGE_S16(l, x3, x7)); - - #undef MERGE_S16 - /* }}} */ -@@ -275,32 +275,32 @@ - */ - #if 1 - /* fdct rows {{{ */ -- vs16(x0) = vec_add(vs16(b00), vs16(b70)); -- vs16(x7) = vec_sub(vs16(b00), vs16(b70)); -- vs16(x1) = vec_add(vs16(b10), vs16(b60)); -- vs16(x6) = vec_sub(vs16(b10), vs16(b60)); -- vs16(x2) = vec_add(vs16(b20), vs16(b50)); -- vs16(x5) = vec_sub(vs16(b20), vs16(b50)); -- vs16(x3) = vec_add(vs16(b30), vs16(b40)); -- vs16(x4) = vec_sub(vs16(b30), vs16(b40)); -+ x0 = ((vector float)vec_add(vs16(b00), vs16(b70))); -+ x7 = ((vector float)vec_sub(vs16(b00), vs16(b70))); -+ x1 = ((vector float)vec_add(vs16(b10), vs16(b60))); -+ x6 = ((vector float)vec_sub(vs16(b10), vs16(b60))); -+ x2 = ((vector float)vec_add(vs16(b20), vs16(b50))); -+ x5 = ((vector float)vec_sub(vs16(b20), vs16(b50))); -+ x3 = ((vector float)vec_add(vs16(b30), vs16(b40))); -+ x4 = ((vector float)vec_sub(vs16(b30), vs16(b40))); - -- vs16(b70) = vec_add(vs16(x0), vs16(x3)); -- vs16(b10) = vec_add(vs16(x1), vs16(x2)); -+ b70 = ((vector float)vec_add(vs16(x0), vs16(x3))); -+ b10 = ((vector float)vec_add(vs16(x1), vs16(x2))); - -- vs16(b00) = vec_add(vs16(b70), vs16(b10)); -- vs16(b40) = vec_sub(vs16(b70), vs16(b10)); -+ b00 = ((vector float)vec_add(vs16(b70), vs16(b10))); -+ b40 = ((vector float)vec_sub(vs16(b70), vs16(b10))); - - #define CTF0(n) \ -- vs32(b##n##1) = vec_unpackl(vs16(b##n##0)); \ -- vs32(b##n##0) = vec_unpackh(vs16(b##n##0)); \ -+ b##n##1 = ((vector float)vec_unpackl(vs16(b##n##0))); \ -+ b##n##0 = ((vector float)vec_unpackh(vs16(b##n##0))); \ - b##n##1 = vec_ctf(vs32(b##n##1), 0); \ - b##n##0 = vec_ctf(vs32(b##n##0), 0); - - CTF0(0); - CTF0(4); - -- vs16(b20) = vec_sub(vs16(x0), vs16(x3)); -- vs16(b60) = vec_sub(vs16(x1), vs16(x2)); -+ b20 = ((vector float)vec_sub(vs16(x0), vs16(x3))); -+ b60 = ((vector float)vec_sub(vs16(x1), vs16(x2))); - - CTF0(2); - CTF0(6); -@@ -321,8 +321,8 @@ - b61 = vec_madd(cnst, b61, x1); - - #define CTFX(x,b) \ -- vs32(b##0) = vec_unpackh(vs16(x)); \ -- vs32(b##1) = vec_unpackl(vs16(x)); \ -+ b##0 = ((vector float)vec_unpackh(vs16(x))); \ -+ b##1 = ((vector float)vec_unpackl(vs16(x))); \ - b##0 = vec_ctf(vs32(b##0), 0); \ - b##1 = vec_ctf(vs32(b##1), 0); \ - -@@ -473,9 +473,9 @@ - #define CTS(n) \ - b##n##0 = vec_round(b##n##0); \ - b##n##1 = vec_round(b##n##1); \ -- vs32(b##n##0) = vec_cts(b##n##0, 0); \ -- vs32(b##n##1) = vec_cts(b##n##1, 0); \ -- vs16(b##n##0) = vec_pack(vs32(b##n##0), vs32(b##n##1)); \ -+ b##n##0 = ((vector float)vec_cts(b##n##0, 0)); \ -+ b##n##1 = ((vector float)vec_cts(b##n##1, 0)); \ -+ b##n##0 = ((vector float)vec_pack(vs32(b##n##0), vs32(b##n##1))); \ - vec_st(vs16(b##n##0), 0, bp); - - bp = (vector signed short*)block; diff --git a/media-video/avidemux/files/avidemux-extra-qualification.diff b/media-video/avidemux/files/avidemux-extra-qualification.diff deleted file mode 100644 index bdef615d7f52..000000000000 --- a/media-video/avidemux/files/avidemux-extra-qualification.diff +++ /dev/null @@ -1,102 +0,0 @@ ---- avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h.orig 2006-03-20 20:45:07.000000000 +0100 -+++ avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h 2006-03-20 20:45:23.000000000 +0100 -@@ -12,7 +12,7 @@ - class AccelRender - { - public: -- AccelRender::AccelRender( void); -+ AccelRender( void); - virtual uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0; - virtual uint8_t end(void)=0; - virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0; ---- avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h.orig 2006-03-20 20:37:14.000000000 +0100 -+++ avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h 2006-03-20 20:37:36.000000000 +0100 -@@ -38,9 +38,9 @@ - - uint32_t _type; - -- uint32_t picHeader::read32(FILE *fd); -- uint16_t picHeader::read16(FILE *fd); -- uint8_t picHeader::read8(FILE *fd); -+ uint32_t read32(FILE *fd); -+ uint16_t read16(FILE *fd); -+ uint8_t read8(FILE *fd); - - public: - // static int checkFourCC(uint8_t *in, uint8_t *fourcc); ---- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp.orig 2006-03-20 20:43:19.000000000 +0100 -+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp 2006-03-20 20:43:40.000000000 +0100 -@@ -55,8 +55,8 @@ - void update(void); - public: - -- DGbob::DGbob(AVDMGenericVideoStream *in,CONFcouple *couples); -- DGbob::~DGbob(void); -+ DGbob(AVDMGenericVideoStream *in,CONFcouple *couples); -+ ~DGbob(void); - uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len, - ADMImage *data,uint32_t *flags); - ---- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp.orig 2006-03-20 20:42:14.000000000 +0100 -+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp 2006-03-20 20:42:31.000000000 +0100 -@@ -147,8 +147,8 @@ - - public: - -- Decimate::Decimate(AVDMGenericVideoStream *in,CONFcouple *couples); -- Decimate::~Decimate(void); -+ Decimate(AVDMGenericVideoStream *in,CONFcouple *couples); -+ ~Decimate(void); - uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len, - ADMImage *data,uint32_t *flags); - ---- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h.orig 2006-03-20 20:39:18.000000000 +0100 -+++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h 2006-03-20 20:40:49.000000000 +0100 -@@ -112,32 +112,32 @@ - - public: - -- void Telecide::CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, -+ void CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, - unsigned char *prp, unsigned char *prpU, unsigned char *prpV); -- void Telecide::Show(ADMImage *dst, int frame); -- void Telecide::Debug(int frame); -+ void Show(ADMImage *dst, int frame); -+ void Debug(int frame); - -- Telecide::Telecide(AVDMGenericVideoStream *in,CONFcouple *couples); -+ Telecide(AVDMGenericVideoStream *in,CONFcouple *couples); - -- Telecide::~Telecide(); -+ ~Telecide(); - -- void Telecide::PutChosen(int frame, unsigned int chosen); -+ void PutChosen(int frame, unsigned int chosen); - - -- void Telecide::CacheInsert(int frame, unsigned int p, unsigned int pblock, -+ void CacheInsert(int frame, unsigned int p, unsigned int pblock, - unsigned int c, unsigned int cblock); - -- bool Telecide::CacheQuery(int frame, unsigned int *p, unsigned int *pblock, -+ bool CacheQuery(int frame, unsigned int *p, unsigned int *pblock, - unsigned int *c, unsigned int *cblock); - -- bool Telecide::PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ; -+ bool PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ; - -- struct PREDICTION *Telecide::PredictSoftYUY2(int frame); -+ struct PREDICTION *PredictSoftYUY2(int frame); - -- void Telecide::WriteHints(unsigned char *dst, bool film, bool inpattern); -- virtual uint8_t Telecide::getFrameNumberNoAlloc(uint32_t frame, uint32_t *len, -+ void WriteHints(unsigned char *dst, bool film, bool inpattern); -+ virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len, - ADMImage *data,uint32_t *flags); -- char *Telecide::printConf( void ); -- uint8_t Telecide::configure(AVDMGenericVideoStream *in); -- uint8_t Telecide::getCoupledConf( CONFcouple **couples); -+ char *printConf( void ); -+ uint8_t configure(AVDMGenericVideoStream *in); -+ uint8_t getCoupledConf( CONFcouple **couples); - }; -- 2.26.2