packages: mplayer/mplayer-altivec.patch, mplayer/mplayer-ldflags.patch, mpl...

pluto pluto at pld-linux.org
Tue Nov 30 10:38:04 CET 2010 

Author: pluto                        Date: Tue Nov 30 09:38:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for new snapshot.

---- Files affected:
packages/mplayer:
   mplayer-altivec.patch (1.6 -> 1.7) , mplayer-ldflags.patch (1.2 -> 1.3) , mplayer-link.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/mplayer/mplayer-altivec.patch
diff -u packages/mplayer/mplayer-altivec.patch:1.6 packages/mplayer/mplayer-altivec.patch:1.7
--- packages/mplayer/mplayer-altivec.patch:1.6	Wed Nov 18 04:23:09 2009
+++ packages/mplayer/mplayer-altivec.patch	Tue Nov 30 10:37:58 2010
@@ -1,23 +1,23 @@
---- mplayer/configure.orig	2009-11-17 23:59:50.000000000 +0100
-+++ mplayer/configure	2009-11-18 02:23:19.760319977 +0100
-@@ -742,6 +742,7 @@
- _w32threads=auto
+--- mplayer-r32669/configure.orig	2010-11-30 09:25:22.955081286 +0100
++++ mplayer-r32669/configure	2010-11-30 09:28:43.457857573 +0100
+@@ -790,6 +790,7 @@
  _ass=auto
+ ass_internal=auto
  _rpath=no
 +_disable_altivec=no
  _asmalign_pot=auto
  _stream_cache=yes
  _priority=no
-@@ -1315,7 +1316,7 @@
-   --enable-fast-cmov) _fast_cmov=yes ;;
-   --disable-fast-cmov) _fast_cmov=no ;;
+@@ -1356,7 +1357,7 @@
+   --enable-fast-clz) _fast_clz=yes ;;
+   --disable-fast-clz) _fast_clz=no ;;
    --enable-altivec) _altivec=yes ;;
 -  --disable-altivec) _altivec=no ;;
 +  --disable-altivec) _altivec=no; _disable_altivec=yes ;;
    --enable-armv5te) _armv5te=yes ;;
    --disable-armv5te) _armv5te=no ;;
    --enable-armv6) _armv6=yes ;;
-@@ -2639,15 +2640,15 @@
+@@ -2762,12 +2763,12 @@
  
  #FIXME: This should happen before the check for CFLAGS..
  def_altivec_h='#define HAVE_ALTIVEC_H 0'
@@ -26,13 +26,9 @@
  
      # check if AltiVec is supported by the compiler, and how to enable it
      echocheck "GCC AltiVec flags"
-     cat > $TMPC << EOF
- int main(void) { return 0; }
- EOF
--    if $(cc_check -maltivec -mabi=altivec) ; then
+     if $(cflag_check -maltivec -mabi=altivec) ; then
 -    _altivec_gcc_flags="-maltivec -mabi=altivec"
-+    if $(cc_check -maltivec) ; then
 +    _altivec_gcc_flags="-maltivec"
      # check if <altivec.h> should be included
-     cat > $TMPC << EOF
- #include <altivec.h>
+         if $(header_check altivec.h $_altivec_gcc_flags) ; then
+             def_altivec_h='#define HAVE_ALTIVEC_H 1'

================================================================
Index: packages/mplayer/mplayer-ldflags.patch
diff -u packages/mplayer/mplayer-ldflags.patch:1.2 packages/mplayer/mplayer-ldflags.patch:1.3
--- packages/mplayer/mplayer-ldflags.patch:1.2	Sun Apr 25 22:40:31 2010
+++ packages/mplayer/mplayer-ldflags.patch	Tue Nov 30 10:37:58 2010
@@ -1,6 +1,6 @@
---- mplayer-r29930/configure~	2009-11-18 23:39:45.454305454 +0100
-+++ mplayer-r29930/configure	2009-11-18 23:57:29.464192117 +0100
-@@ -481,7 +481,8 @@
+--- mplayer-r32669/configure.orig	2010-11-03 09:12:22.000000000 +0100
++++ mplayer-r32669/configure	2010-11-30 09:21:10.000406064 +0100
+@@ -523,7 +523,8 @@
  
  Use these options if autodetection fails:
    --extra-cflags=FLAGS        extra CFLAGS
@@ -10,7 +10,7 @@
    --extra-libs=FLAGS          extra linker flags
    --extra-libs-mplayer=FLAGS  extra linker flags for MPlayer
    --extra-libs-mencoder=FLAGS extra linker flags for MEncoder
-@@ -819,6 +820,9 @@
+@@ -853,6 +854,9 @@
    --extra-cflags=*)
      extra_cflags=$(echo $ac_option | cut -d '=' -f 2-)
      ;;
@@ -20,16 +20,16 @@
    --extra-ldflags=*)
      extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
      ;;
-@@ -8000,7 +8000,7 @@
- int main(void) { return 0; }
- EOF
- if cc_check -Wl,-z,noexecstack ; then
+@@ -7802,7 +7806,7 @@
+ 
+ echocheck "compiler support for noexecstack"
+ if cflag_check -Wl,-z,noexecstack ; then
 -  extra_ldflags="-Wl,-z,noexecstack $extra_ldflags"
 +  real_ldflags="-Wl,-z,noexecstack $real_ldflags"
    echores "yes"
  else
    echores "no"
-@@ -8463,6 +8463,7 @@
+@@ -8023,6 +8027,7 @@
  CFLAGS_SVGALIB_HELPER    = $cflags_svgalib_helper
  CFLAGS_TREMOR_LOW        = $cflags_tremor_low
  
@@ -37,23 +37,23 @@
  EXTRALIBS          = $extra_ldflags $_ld_static $_ld_lm $extra_libs
  EXTRALIBS_MPLAYER  = $libs_mplayer
  EXTRALIBS_MENCODER = $libs_mencoder
---- mplayer-r29930/Makefile~	2009-11-17 23:59:50.000000000 +0100
-+++ mplayer-r29930/Makefile	2009-11-19 00:07:17.952054067 +0100
-@@ -838,7 +838,7 @@
+--- mplayer-r32669/Makefile.orig	2010-10-27 19:55:45.000000000 +0200
++++ mplayer-r32669/Makefile	2010-11-30 09:24:31.973414915 +0100
+@@ -853,7 +853,7 @@
  mplayer$(EXESUF): $(MPLAYER_DEPS)
  mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
  mencoder$(EXESUF) mplayer$(EXESUF):
 -	$(CC) -o $@ $^ $(EXTRALIBS)
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
  
- codec-cfg$(EXESUF): codec-cfg.c help_mp.h
- 	$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
-@@ -1045,7 +1045,7 @@
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+ 	$(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
+@@ -1072,7 +1072,7 @@
  TOOLS/netstream$(EXESUF): TOOLS/netstream.c
  TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
  TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
--	$(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
+-	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
++	$(CC) $(CC_DEPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
  
  REAL_SRCS    = $(wildcard TOOLS/realcodecs/*.c)
  REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)

================================================================
Index: packages/mplayer/mplayer-link.patch
diff -u packages/mplayer/mplayer-link.patch:1.1 packages/mplayer/mplayer-link.patch:1.2
--- packages/mplayer/mplayer-link.patch:1.1	Mon Nov 29 22:47:13 2010
+++ packages/mplayer/mplayer-link.patch	Tue Nov 30 10:37:58 2010
@@ -1,11 +1,11 @@
---- mplayer-r31097/Makefile.orig	2010-11-28 14:02:59.000000000 +0100
-+++ mplayer-r31097/Makefile	2010-11-28 19:19:48.898402624 +0100
-@@ -740,7 +740,7 @@
+--- mplayer-r32669/Makefile.orig	2010-11-30 09:29:43.000000000 +0100
++++ mplayer-r32669/Makefile	2010-11-30 09:31:08.071501256 +0100
+@@ -734,7 +734,7 @@
  OBJS_MPLAYER   += $(OBJS_MPLAYER-yes)
  
  MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
 -MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(COMMON_LIBS)
 +MPLAYER_DEPS  = $(OBJS_MPLAYER)  $(OBJS_COMMON) $(COMMON_LIBS) -lXext -lX11
- DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
+ DEP_FILES = $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)
+ $(foreach suffix,.c .cpp .m .S,$(eval DEP_FILES := $(DEP_FILES:$(suffix)=.d)))
  
- ALL_PRG-$(MPLAYER)  += mplayer$(EXESUF)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-altivec.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-ldflags.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-link.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list