Line
Link Here
|
0 |
-- /dev/null |
0 |
++ portage/media-libs/libmpeg2/files/libmpeg2-0.5.1-pic.patch |
Line 0
Link Here
|
0 |
-- portage.orig/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild |
1 |
--- libmpeg2-0.5.1/configure.ac |
|
|
2 |
+++ libmpeg2-0.5.1/configure.ac |
3 |
@@ -124,6 +124,12 @@ fi |
4 |
|
5 |
AM_CONDITIONAL(ARCH_ARM, ${arm_conditional}) |
6 |
|
7 |
+AC_ARG_ENABLE([arm-asm], |
8 |
+ [ --disable-arm-asm disable non-PIC ARM assembly code]) |
9 |
+if test x"$enable_arm_asm" = x"no"; then |
10 |
+ AC_DEFINE([ARM_NO_ASM],,[disable non-PIC ARM assembly code]) |
11 |
+fi |
12 |
+ |
13 |
dnl Checks for libtool - this must be done after we set cflags |
14 |
AC_LIBTOOL_WIN32_DLL |
15 |
AC_PROG_LIBTOOL |
16 |
--- libmpeg2-0.5.1/libmpeg2/motion_comp.c |
17 |
+++ libmpeg2-0.5.1/libmpeg2/motion_comp.c |
18 |
@@ -57,7 +57,7 @@ void mpeg2_mc_init (uint32_t accel) |
19 |
mpeg2_mc = mpeg2_mc_vis; |
20 |
else |
21 |
#endif |
22 |
-#ifdef ARCH_ARM |
23 |
+#if defined(ARCH_ARM) && !defined(ARM_NO_ASM) |
24 |
if (accel & MPEG2_ACCEL_ARM) { |
25 |
mpeg2_mc = mpeg2_mc_arm; |
26 |
} else |
27 |
--- libmpeg2-0.5.1.orig/libmpeg2/motion_comp_arm.c |
28 |
+++ libmpeg2-0.5.1/libmpeg2/motion_comp_arm.c |
29 |
@@ -22,7 +22,7 @@ |
30 |
|
31 |
#include "config.h" |
32 |
|
33 |
-#ifdef ARCH_ARM |
34 |
+#if defined(ARCH_ARM) && !defined(ARM_NO_ASM) |
35 |
|
36 |
#include <inttypes.h> |
37 |
|
38 |
--- libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S |
39 |
+++ libmpeg2-0.5.1/libmpeg2/motion_comp_arm_s.S |
40 |
@@ -18,6 +18,10 @@ |
41 |
@ along with mpeg2dec; if not, write to the Free Software |
42 |
@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
43 |
|
44 |
+#include "config.h" |
45 |
+ |
46 |
+@ Allow disabling of asm |
47 |
+#ifndef ARM_NO_ASM |
48 |
|
49 |
@ Data preload is supported only by ARM V5TE and above |
50 |
|
51 |
@@ -335,3 +339,5 @@ MC_put_x_8_arm_align_jt: |
52 |
.word MC_put_x_8_arm_align1 |
53 |
.word MC_put_x_8_arm_align2 |
54 |
.word MC_put_x_8_arm_align3 |
55 |
+ |
56 |
+#endif |
|
|
57 |
++ portage/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild |
Lines 13-19
SRC_URI="http://libmpeg2.sourceforge.net
Link Here
|
13 |
LICENSE="GPL-2" |
13 |
LICENSE="GPL-2" |
14 |
SLOT="0" |
14 |
SLOT="0" |
15 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" |
15 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" |
16 |
IUSE="sdl static-libs X" |
16 |
IUSE="pic sdl static-libs X" |
17 |
|
17 |
|
18 |
RDEPEND="sdl? ( media-libs/libsdl ) |
18 |
RDEPEND="sdl? ( media-libs/libsdl ) |
19 |
X? ( x11-libs/libXv |
19 |
X? ( x11-libs/libXv |
Lines 31-38
src_prepare() {
Link Here
|
31 |
epatch \ |
31 |
epatch \ |
32 |
"${FILESDIR}"/${P}-arm-private-symbols.patch \ |
32 |
"${FILESDIR}"/${P}-arm-private-symbols.patch \ |
33 |
"${FILESDIR}"/${P}-global-symbol-test.patch \ |
33 |
"${FILESDIR}"/${P}-global-symbol-test.patch \ |
34 |
"${FILESDIR}"/${P}-armv4l.patch |
34 |
"${FILESDIR}"/${P}-armv4l.patch \ |
|
|
35 |
"${FILESDIR}"/${P}-pic.patch |
35 |
elibtoolize |
36 |
elibtoolize |
|
|
37 |
eautoheader |
36 |
### PowerPC fix for altivec |
38 |
### PowerPC fix for altivec |
37 |
epatch "${FILESDIR}"/${P}-altivec.patch |
39 |
epatch "${FILESDIR}"/${P}-altivec.patch |
38 |
eautoconf |
40 |
eautoconf |
Lines 44-50
multilib_src_configure() {
Link Here
|
44 |
$(use_enable static-libs static) \ |
46 |
$(use_enable static-libs static) \ |
45 |
--enable-shared \ |
47 |
--enable-shared \ |
46 |
$(multilib_native_use_enable sdl) \ |
48 |
$(multilib_native_use_enable sdl) \ |
47 |
$(multilib_native_use_with X x) |
49 |
$(multilib_native_use_with X x) \ |
|
|
50 |
$(usex pic --disable-arm-asm) |
48 |
|
51 |
|
49 |
# remove useless subdirs |
52 |
# remove useless subdirs |
50 |
if ! multilib_is_native_abi ; then |
53 |
if ! multilib_is_native_abi ; then |