Author: sparky Date: Thu Nov 19 16:31:24 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rewritten to make it work, no libtool, just gcc:
works but there are some problems with assembler mmx code (can't find
symbols ?)
---- Files affected:
packages/mplayer:
mplayer-shared.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/mplayer/mplayer-shared.patch
diff -u packages/mplayer/mplayer-shared.patch:1.1
packages/mplayer/mplayer-shared.patch:1.2
--- packages/mplayer/mplayer-shared.patch:1.1 Sun Sep 25 21:44:03 2005
+++ packages/mplayer/mplayer-shared.patch Thu Nov 19 17:31:19 2009
@@ -1,65 +1,43 @@
-#--- ./Makefile~ 2005-09-25 22:02:58.000000000 +0300
-#+++ ./Makefile 2005-09-25 22:05:35.000000000 +0300
-#@@ -240,11 +240,15 @@
-# OBJS_MPLAYER += osdep/mplayer-rc.o
-# endif
-#
-#-$(PRG): $(MPLAYER_DEP)
-#+
-#+libmplayer-common.so:
-#+ $(CC) $(CFLAGS) -o libmplayer-common.so -shared $(COMMON_LIBS)
-#+
-#+$(PRG): $(MPLAYER_DEP) libmplayer-common.so
-# ifeq ($(TARGET_WIN32),yes)
-# windres -o osdep/mplayer-rc.o osdep/mplayer.rc
-# endif
-#- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a
$(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS)
$(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB)
$(I18NLIBS) $(MATH_LIB)
-#+ $(CC) $(CFLAGS) -o $(PRG) -L. -lmplayer-common $(OBJS_MPLAYER)
libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS)
$(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB)
$(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-#
-# mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
-# winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
-#@@ -258,8 +262,8 @@
-# $(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so
mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS)
$(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS)
$(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB)
$(MATH_LIB)
-#
-# ifeq ($(MENCODER),yes)
-#-$(PRG_MENCODER): $(MENCODER_DEP)
-#- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER)
libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB)
$(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-#+$(PRG_MENCODER): $(MENCODER_DEP) libmplayer-common.so
-#+ $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -L.
-lmplayer-common libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(EXTRA_LIB)
$(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-# endif
-#
-# codecs.conf.h: $(PRG_CFG) etc/codecs.conf
---- ./Makefile~ 2005-09-25 22:02:58.000000000 +0300
-+++ ./Makefile 2005-09-25 22:06:48.000000000 +0300
-@@ -240,11 +240,18 @@
- OBJS_MPLAYER += osdep/mplayer-rc.o
- endif
+--- mplayer-r29930/Makefile.orig 2009-11-19 12:35:34.062218530 +0100
++++ mplayer-r29930/Makefile 2009-11-19 12:37:01.221820848 +0100
+@@ -833,12 +833,17 @@
+ $(MAKE) -C $(@D)
+ touch $@
--$(PRG): $(MPLAYER_DEP)
+-mencoder$(EXESUF): $(MENCODER_DEPS)
++SHARED_OBJS = $(sort $(OBJS_COMMON))
+
-+SHARED_VERSION = 0.0.0
-+# libtool --mode=link $(CC) $(CFLAGS) -o $@ -shared $(COMMON_LIBS)
-avoid-version -release $(SHARED_VERSION)
++libmplayer.so: $(SHARED_OBJS) $(COMMON_LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -avoid-version $^ $(EXTRALIBS)
$(EXTRALIBS_MENCODER) $(EXTRALIBS_MPLAYER)
+
-+libmplayer.la:
-+ libtool --mode=link $(CC) $(CFLAGS) -o $@ -shared $(COMMON_LIBS)
-avoid-version -release $(SHARED_VERSION)
-+
-+$(PRG): $(MPLAYER_DEP) libmplayer.la
- ifeq ($(TARGET_WIN32),yes)
- windres -o osdep/mplayer-rc.o osdep/mplayer.rc
- endif
-- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a
$(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS)
$(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB)
$(I18NLIBS) $(MATH_LIB)
-+ libtool --mode=link $(CC) $(CFLAGS) -o $(PRG) libmplayer.la
$(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS)
$(GUI_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB)
$(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
++mencoder$(EXESUF): $(OBJS_MENCODER) libmplayer.so
+ mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER)
+-mplayer$(EXESUF): $(MPLAYER_DEPS)
++mplayer$(EXESUF): $(OBJS_MPLAYER) libmplayer.so
+ mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
+ mencoder$(EXESUF) mplayer$(EXESUF):
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ libavutil/libavutil.a $(EXTRALIBS)
- mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
- winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
-@@ -258,8 +265,8 @@
- $(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so
mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS)
$(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS)
$(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB)
$(MATH_LIB)
+ codec-cfg$(EXESUF): codec-cfg.c help_mp.h
+ $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
+@@ -1044,7 +1049,7 @@
- ifeq ($(MENCODER),yes)
--$(PRG_MENCODER): $(MENCODER_DEP)
-- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER)
libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB)
$(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
-+$(PRG_MENCODER): $(MENCODER_DEP) libmplayer.la
-+ libtool --mode=link $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER)
libmplayer.la libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(EXTRA_LIB)
$(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
- endif
+ 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)
++TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst
mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out
%mencoder.o,$(OBJS_MENCODER)) libmplayer.so
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER)
$(EXTRALIBS_MENCODER) $(EXTRALIBS)
- codecs.conf.h: $(PRG_CFG) etc/codecs.conf
+ REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
+--- mplayer-r29930/libavutil/mem.h.orig 2009-11-17 23:59:52.000000000
+0100
++++ mplayer-r29930/libavutil/mem.h 2009-11-19 12:37:44.429409470 +0100
+@@ -32,7 +32,7 @@
+ #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
+ #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n)))
v
+ #elif defined(__GNUC__)
+- #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
++ #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
__attribute__ ((visibility ("hidden")))
+ #define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used
__attribute__ ((aligned (n)))
+ #elif defined(_MSC_VER)
+ #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-shared.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
