From a379dc48bce10aa3579761a7c8248fc7ac9672e7 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 1 May 2008 13:38:02 +0000
Subject: Build libmpeg2 AltiVec code on PPC always, not just when AltiVec is
 available. libmpeg2 decides on the correct functions to use at runtime.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26628 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 372c30586e..418ece3c1b 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA)   += libmpeg2/idct_alpha.c \
 SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARMV4L)  += libmpeg2/motion_comp_arm.c \
                                            libmpeg2/motion_comp_arm_s.S \
                                            libmpeg2/motion_comp_iwmmxt.c
-SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
+SRCS_COMMON-$(LIBMPEG2)-$(ARCH_POWERPC) += libmpeg2/idct_altivec.c \
                                            libmpeg2/motion_comp_altivec.c
 SRCS_COMMON-$(LIBMPEG2)-$(HAVE_MMX)     += libmpeg2/idct_mmx.c \
                                            libmpeg2/motion_comp_mmx.c
-- 
cgit v1.2.3


From 011e976df9a2e7aaaf8bd08447bebe41f5ca599c Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 1 May 2008 14:02:35 +0000
Subject: Remove recurse target. Instead, make FFmpeg parts depend on the phony
 recurse target so that their directories will be recursed unconditionally.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26632 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 418ece3c1b..6c90995cd3 100644
--- a/Makefile
+++ b/Makefile
@@ -690,10 +690,7 @@ DIRS =  . \
         TOOLS \
         vidix \
 
-all: recurse $(ALL_PRG)
-
-recurse:
-	for part in $(PARTS); do $(MAKE) -C $$part; done
+all: $(ALL_PRG)
 
 %.d: %.c
 	$(MPDEPEND_CMD) > $@
@@ -744,7 +741,7 @@ ifneq ($(HELP_FILE),help/help_mp-en.h)
 endif
 
 define RECURSIVE_RULE
-$(part)/$(part).a:
+$(part)/$(part).a: recurse
 	$(MAKE) -C $(part)
 endef
 
-- 
cgit v1.2.3


From a7b11f39278555db59704d86d26ec7f3954b967c Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 1 May 2008 16:22:52 +0000
Subject: realrtsp depends on librtsp/rtsp.c

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26633 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6c90995cd3..b0718da38d 100644
--- a/Makefile
+++ b/Makefile
@@ -376,6 +376,7 @@ SRCS_COMMON-$(MPLAYER_NETWORK)       += stream/stream_netstream.c \
                                         stream/tcp.c \
                                         stream/stream_rtp.c \
                                         stream/stream_udp.c \
+                                        stream/librtsp/rtsp.c \
                                         stream/realrtsp/asmrp.c \
                                         stream/realrtsp/real.c \
                                         stream/realrtsp/rmff.c \
-- 
cgit v1.2.3


From d8fccf4d46c3751f96191b454d982c182de3e18c Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 3 May 2008 15:23:22 +0000
Subject: Only compile and use libmpeg2 AltiVec code when AltiVec is available.
 The AltiVec code needs -maltivec to compile, but then AltiVec instructions
 appear in other places of the code causing MPlayer to sigill. Somehow
 upstream libmpeg2 manages not to sigill under what appear to be the same
 circumstances. Enlightenment welcome.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26657 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b0718da38d..e68bae0d0a 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA)   += libmpeg2/idct_alpha.c \
 SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARMV4L)  += libmpeg2/motion_comp_arm.c \
                                            libmpeg2/motion_comp_arm_s.S \
                                            libmpeg2/motion_comp_iwmmxt.c
-SRCS_COMMON-$(LIBMPEG2)-$(ARCH_POWERPC) += libmpeg2/idct_altivec.c \
+SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
                                            libmpeg2/motion_comp_altivec.c
 SRCS_COMMON-$(LIBMPEG2)-$(HAVE_MMX)     += libmpeg2/idct_mmx.c \
                                            libmpeg2/motion_comp_mmx.c
-- 
cgit v1.2.3


From 2fb6c0aabf93ae52c78412cf8f027e85bb4ce198 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 3 May 2008 15:57:54 +0000
Subject: Make the checkheaders target work non-recursively.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26662 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e68bae0d0a..9dc7d52cde 100644
--- a/Makefile
+++ b/Makefile
@@ -892,7 +892,7 @@ TAGS:
 tags:
 	rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a
 
-ALLHEADERS = $(wildcard *.h)
+ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
 checkheaders: $(ALLHEADERS:.h=.ho)
 
 # ./configure must be rerun if it changed
-- 
cgit v1.2.3