April 2008 - MPlayer-cvslog - lists.mplayerhq.hu

r26571 - trunk/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 15:28:36 2008 New Revision: 26571 Log: Make sure all autogenerated .h and .c files exist in the vidix subdirectory before trying to create object or dependency files there. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 15:28:36 2008 @@ -713,7 +713,10 @@ VIDIX_PCI_FILES = vidix/pci_dev_ids.c vi $(VIDIX_PCI_FILES): vidix/pci.db LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) -vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) +VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) +VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) + +$(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) @@ -900,6 +903,6 @@ TOOLS/netstream$(EXESUF): TOOLS/netstrea toolsclean: rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 --include $(DEPS) +#-include $(DEPS) .PHONY: all doxygen *install* recurse strip *tools

2 1

r26570 - in trunk/loader/qtx: list.c qtxload.c
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 15:07:01 2008 New Revision: 26570 Log: Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwards anyway. The calls were missing parameters and caused compilation failures. Modified: trunk/loader/qtx/list.c trunk/loader/qtx/qtxload.c Modified: trunk/loader/qtx/list.c ============================================================================== --- trunk/loader/qtx/list.c (original) +++ trunk/loader/qtx/list.c Mon Apr 28 15:07:01 2008 @@ -53,7 +53,6 @@ int main(int argc, char *argv[]){ desc.componentFlagsMask=0; printf("Count = %ld\n",CountComponents(&desc)); - - Restore_LDT_Keeper(); + exit(0); } Modified: trunk/loader/qtx/qtxload.c ============================================================================== --- trunk/loader/qtx/qtxload.c (original) +++ trunk/loader/qtx/qtxload.c Mon Apr 28 15:07:01 2008 @@ -122,8 +122,7 @@ int main(int argc, char *argv[]){ // for(i=0;i<0x00001837;i++) // if(x_table[i]) printf("x_table[0x%X] = %p\n",i,x_table[i]); - - Restore_LDT_Keeper(); + exit(0); //return 0; }

1 0

r26569 - in trunk/loader/qtx: list.c qtxload.c
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 15:05:25 2008 New Revision: 26569 Log: Add missing ldt_keeper.h #include; this fixes a bunch of implicit declaration of function warnings. Modified: trunk/loader/qtx/list.c trunk/loader/qtx/qtxload.c Modified: trunk/loader/qtx/list.c ============================================================================== --- trunk/loader/qtx/list.c (original) +++ trunk/loader/qtx/list.c Mon Apr 28 15:05:25 2008 @@ -8,6 +8,7 @@ #include "qtxsdk/components.h" #include "qtxsdk/select.h" +#include "ldt_keeper.h" char* get_path(const char* x){ return strdup(x);} void* LoadLibraryA(char* name); Modified: trunk/loader/qtx/qtxload.c ============================================================================== --- trunk/loader/qtx/qtxload.c (original) +++ trunk/loader/qtx/qtxload.c Mon Apr 28 15:05:25 2008 @@ -4,6 +4,7 @@ #include "qtxsdk/components.h" #include "qtxsdk/select.h" +#include "ldt_keeper.h" #include "mp_msg.h" /* ilyen egy sima komponens */

1 0

r26568 - trunk/loader/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:41:39 2008 New Revision: 26568 Log: Merge TEST_OBJS and TEST_LDFLAGS. Modified: trunk/loader/Makefile Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Mon Apr 28 14:41:39 2008 @@ -36,12 +36,11 @@ include ../mpcommon.mak CFLAGS+=-fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) win32.o: CFLAGS += $(CFLAG_STACKREALIGN) -TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/mmap_anon.o ../osdep/$(GETCH) ../osdep/$(TIMER) -TEST_LDFLAGS = -ltermcap -lm +TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/mmap_anon.o ../osdep/$(GETCH) ../osdep/$(TIMER) -ltermcap -lm qtx/list qtx/qtxload: CFLAGS += -g -qtx/%: qtx/%.c $(TEST_OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) +qtx/list: qtx/list.c $(TEST_OBJS) +qtx/qtxload: qtx/qtxload.c $(TEST_OBJS) clean:: rm -f dshow/*.o dshow/*.a dshow/*~

1 0

r26567 - trunk/loader/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:39:15 2008 New Revision: 26567 Log: Add -g to CFLAGS, not to LDFLAGS. Modified: trunk/loader/Makefile Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Mon Apr 28 14:39:15 2008 @@ -37,8 +37,9 @@ CFLAGS+=-fno-omit-frame-pointer $(CFLAG_ win32.o: CFLAGS += $(CFLAG_STACKREALIGN) TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/mmap_anon.o ../osdep/$(GETCH) ../osdep/$(TIMER) -TEST_LDFLAGS = -ltermcap -lm -g +TEST_LDFLAGS = -ltermcap -lm +qtx/list qtx/qtxload: CFLAGS += -g qtx/%: qtx/%.c $(TEST_OBJS) $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS)

1 0

r26566 - trunk/loader/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:35:20 2008 New Revision: 26566 Log: Merge test program compilation rules using patterns. Modified: trunk/loader/Makefile Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Mon Apr 28 14:35:20 2008 @@ -39,10 +39,7 @@ win32.o: CFLAGS += $(CFLAG_STACKREALIGN) TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/mmap_anon.o ../osdep/$(GETCH) ../osdep/$(TIMER) TEST_LDFLAGS = -ltermcap -lm -g -qtx/qtxload: qtx/qtxload.c $(TEST_OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) - -qtx/list: qtx/list.c $(TEST_OBJS) +qtx/%: qtx/%.c $(TEST_OBJS) $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) clean::

1 0

r26565 - trunk/loader/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:34:30 2008 New Revision: 26565 Log: Add CFLAGS to test program compilation commands. Modified: trunk/loader/Makefile Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Mon Apr 28 14:34:30 2008 @@ -40,10 +40,10 @@ TEST_OBJS = $(LIBNAME_COMMON) ../cpud TEST_LDFLAGS = -ltermcap -lm -g qtx/qtxload: qtx/qtxload.c $(TEST_OBJS) - $(CC) -o $@ $^ $(TEST_LDFLAGS) + $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) qtx/list: qtx/list.c $(TEST_OBJS) - $(CC) -o $@ $^ $(TEST_LDFLAGS) + $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) clean:: rm -f dshow/*.o dshow/*.a dshow/*~

1 0

r26564 - trunk/loader/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:32:23 2008 New Revision: 26564 Log: Add missing ../osdep/mmap_anon.o to TEST_OBJS. Modified: trunk/loader/Makefile Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Mon Apr 28 14:32:23 2008 @@ -36,7 +36,7 @@ include ../mpcommon.mak CFLAGS+=-fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) win32.o: CFLAGS += $(CFLAG_STACKREALIGN) -TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/$(GETCH) ../osdep/$(TIMER) +TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/mmap_anon.o ../osdep/$(GETCH) ../osdep/$(TIMER) TEST_LDFLAGS = -ltermcap -lm -g qtx/qtxload: qtx/qtxload.c $(TEST_OBJS)

1 0

r26563 - trunk/loader/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:31:24 2008 New Revision: 26563 Log: Remove unnecessary linker flags. Modified: trunk/loader/Makefile Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Mon Apr 28 14:31:24 2008 @@ -37,7 +37,7 @@ CFLAGS+=-fno-omit-frame-pointer $(CFLAG_ win32.o: CFLAGS += $(CFLAG_STACKREALIGN) TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/$(GETCH) ../osdep/$(TIMER) -TEST_LDFLAGS = -ltermcap -ldl -lm -lpthread -g +TEST_LDFLAGS = -ltermcap -lm -g qtx/qtxload: qtx/qtxload.c $(TEST_OBJS) $(CC) -o $@ $^ $(TEST_LDFLAGS)

1 0

r26562 - trunk/loader/qtx/qtxload.c
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 14:03:52 2008 New Revision: 26562 Log: Add missing #include, fixes the warning: qtx/qtxload.c:50: warning: implicit declaration of function 'mp_msg_init' Modified: trunk/loader/qtx/qtxload.c Modified: trunk/loader/qtx/qtxload.c ============================================================================== --- trunk/loader/qtx/qtxload.c (original) +++ trunk/loader/qtx/qtxload.c Mon Apr 28 14:03:52 2008 @@ -4,6 +4,7 @@ #include "qtxsdk/components.h" #include "qtxsdk/select.h" +#include "mp_msg.h" /* ilyen egy sima komponens */ ComponentResult ComponentDummy(

1 0