diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/aften/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/aften/files')
-rw-r--r-- | media-libs/aften/files/aften-0.0.8-multilib.patch | 13 | ||||
-rw-r--r-- | media-libs/aften/files/aften-0.0.8-ppc.patch | 97 |
2 files changed, 110 insertions, 0 deletions
diff --git a/media-libs/aften/files/aften-0.0.8-multilib.patch b/media-libs/aften/files/aften-0.0.8-multilib.patch new file mode 100644 index 000000000000..f09b8dc5bb1c --- /dev/null +++ b/media-libs/aften/files/aften-0.0.8-multilib.patch @@ -0,0 +1,13 @@ +Index: aften-0.0.8/CMakeLists.txt +=================================================================== +--- aften-0.0.8.orig/CMakeLists.txt ++++ aften-0.0.8/CMakeLists.txt +@@ -305,6 +305,6 @@ ENDIF(BINDINGS_CXX) + + INSTALL(TARGETS ${INSTALL_TARGETS} aften_exe wavinfo wavrms wavfilter + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ${INSTALL_HEADERS} libaften/aften.h libaften/aften-types.h DESTINATION include/aften) diff --git a/media-libs/aften/files/aften-0.0.8-ppc.patch b/media-libs/aften/files/aften-0.0.8-ppc.patch new file mode 100644 index 000000000000..a841acf8f568 --- /dev/null +++ b/media-libs/aften/files/aften-0.0.8-ppc.patch @@ -0,0 +1,97 @@ +Index: libaften/ppc/ppc_cpu_caps.h +=================================================================== +--- libaften/ppc/ppc_cpu_caps.h ++++ libaften/ppc/ppc_cpu_caps.h +@@ -20,6 +20,7 @@ + #ifndef PPC_CPU_CAPS_H + #define PPC_CPU_CAPS_H + ++#include "aften-types.h" + #include "common.h" + #include "cpu_caps.h" + +Index: libaften/ppc/mdct_altivec.c +=================================================================== +--- libaften/ppc/mdct_altivec.c (revision 659) ++++ libaften/ppc/mdct_altivec.c (revision 660) +@@ -47,11 +47,11 @@ + #include "mem.h" + + // sign change constants +-static const vec_u32_t vPNNP = (vec_u32_t) ++static const vec_u32_t vPNNP = VEC_U32 + (0x00000000, 0x80000000, 0x80000000, 0x00000000); +-static const vec_u32_t vPNPN = (vec_u32_t) ++static const vec_u32_t vPNPN = VEC_U32 + (0x00000000, 0x80000000, 0x00000000, 0x80000000); +-static const vec_u32_t vNNNN = (vec_u32_t) ++static const vec_u32_t vNNNN = VEC_U32 + (0x80000000, 0x80000000, 0x80000000, 0x80000000); + + +@@ -92,7 +92,7 @@ + vec_u8_t perm1036 = VPERMUTE4(1, 0, 3, 6); + vec_u8_t perm5472 = VPERMUTE4(5, 4, 7, 2); + vector float zero = (vector float) vec_splat_u32(0); +- vector float pi2_8 = (vector float)(AFT_PI2_8, AFT_PI2_8, AFT_PI2_8, AFT_PI2_8); ++ vector float pi2_8 = VEC_FLOAT(AFT_PI2_8, AFT_PI2_8, AFT_PI2_8, AFT_PI2_8); + vector float x0to3, x4to7, x8to11, x12to15; + vector float v1, v2, v3, v4, v5; + +@@ -143,7 +143,7 @@ + vec_u8_t perm0022 = VPERMUTE4(0, 0, 2, 2); + vec_u8_t perm1405 = VPERMUTE4(1, 4, 0, 5); + vector float zero = (vector float) vec_splat_u32(0); +- vector float cpi = (vector float) (AFT_PI2_8, AFT_PI2_8, AFT_PI1_8, AFT_PI3_8); ++ vector float cpi = VEC_FLOAT(AFT_PI2_8, AFT_PI2_8, AFT_PI1_8, AFT_PI3_8); + vec_u32_t vNPNP = vec_sld(vPNPN, vPNPN, 4); + vector float x0to3, x4to7, x8to11, x12to15, x16to19, x20to23, x24to27, x28to31; + vector float pi3122, pi1322, pi1313, pi3131; +@@ -395,7 +395,7 @@ + vec_u8_t perm3636 = vec_add(perm1414, vec_splat_u8(8)); + vec_u8_t perm2266, perm3377; + +- vector float point5 = (vector float) (0.5f, 0.5f, 0.5f, 0.5f); ++ vector float point5 = VEC_FLOAT(0.5f, 0.5f, 0.5f, 0.5f); + vector float zero = (vector float) vec_splat_u32(0); + vec_u32_t vNPNP = vec_sld(vPNPN, vPNPN, 4); + +Index: libaften/ppc/altivec_common.h +=================================================================== +--- libaften/ppc/altivec_common.h (revision 659) ++++ libaften/ppc/altivec_common.h (revision 660) +@@ -28,11 +28,23 @@ + typedef vector unsigned int vec_u32_t; + typedef vector signed int vec_s32_t; + ++#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */ ++#define VEC_U32(a,b,c,d) (vec_u32_t) (a, b, c, d) ++#define VEC_FLOAT(a,b,c,d) (vector float) (a, b, c, d) + #define VPERMUTE4(a,b,c,d) (vec_u8_t) \ + ( (a*4)+0, (a*4)+1, (a*4)+2, (a*4)+3, \ + (b*4)+0, (b*4)+1, (b*4)+2, (b*4)+3, \ + (c*4)+0, (c*4)+1, (c*4)+2, (c*4)+3, \ + (d*4)+0, (d*4)+1, (d*4)+2, (d*4)+3 ) ++#else /* gnu */ ++#define VEC_U32(a,b,c,d) {a, b, c, d} ++#define VEC_FLOAT(a,b,c,d) {a, b, c, d} ++#define VPERMUTE4(a,b,c,d) \ ++ { (a*4)+0, (a*4)+1, (a*4)+2, (a*4)+3, \ ++ (b*4)+0, (b*4)+1, (b*4)+2, (b*4)+3, \ ++ (c*4)+0, (c*4)+1, (c*4)+2, (c*4)+3, \ ++ (d*4)+0, (d*4)+1, (d*4)+2, (d*4)+3 } ++#endif + + static inline vector float vec_ld_float(const float *a) + { +--- ppc_cpu_caps.bak 2007-12-23 17:13:33.000000000 +0000 ++++ libaften/ppc/ppc_cpu_caps.c 2007-12-23 17:13:43.000000000 +0000 +@@ -81,7 +81,7 @@ + //Attempt to use AltiVec + if(!sigsetjmp(g_env, 0)) + { +- asm volatile ( "vor v0, v0, v0" ); ++ asm volatile ( "vor 0, 0, 0" ); + } + + //Restore the old signal handler |