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

r26590 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 09:10:55 2008 New Revision: 26590 Log: Remove generated headers and generated helper binaries only on distclean. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 09:10:55 2008 @@ -811,14 +811,15 @@ uninstall: clean: toolsclean for part in $(PARTS); do $(MAKE) -C $$part clean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) - rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ - codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ - codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) + rm -f mplayer$(EXESUF) mencoder$(EXESUF) distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) - rm -f configure.log config.mak config.h + rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ + version.h $(VIDIX_PCI_FILES) \ + codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) + cpuinfo$(EXESUF) TAGS tags strip: strip -s $(ALL_PRG)

1 0

r26589 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 09:00:27 2008 New Revision: 26589 Log: Remove unnecessary dependency declaration. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 09:00:27 2008 @@ -706,8 +706,6 @@ codec-cfg$(EXESUF): codec-cfg.c codec-cf codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ -codec-cfg.o: codecs.conf.h - codecs2html$(EXESUF): mp_msg.o $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@

1 0

r26588 - trunk/mpcommon.mak
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 08:59:11 2008 New Revision: 26588 Log: Merge nearly identical SRCS_COMMON lines. Modified: trunk/mpcommon.mak Modified: trunk/mpcommon.mak ============================================================================== --- trunk/mpcommon.mak (original) +++ trunk/mpcommon.mak Tue Apr 29 08:59:11 2008 @@ -1,6 +1,4 @@ -SRCS_COMMON += $(SRCS_COMMON-yes) -SRCS_COMMON += $(SRCS_COMMON-yes-yes) -SRCS_COMMON += $(SRCS_COMMON-yes-yes-yes) +SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-yes) SRCS_MENCODER += $(SRCS_MENCODER-yes)

1 0

[propchange]: r26582 - svn:log
by diego 29 Apr '08

29 Apr '08

Author: diego Revision: 26582 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Force to uint64_t first to avoid direct convertion from double to unsigned int. +Force to uint64_t first to avoid direct conversion from double to unsigned int.

2 1

r26587 - in trunk: Makefile mpcommon.mak
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 20:34:59 2008 New Revision: 26587 Log: Get rid of now obsolete library rules and variables. Modified: trunk/Makefile trunk/mpcommon.mak Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 20:34:59 2008 @@ -622,12 +622,11 @@ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) COMMON_LIBS += $(COMMON_LIBS-yes) -LIBS_MPLAYER += $(LIBS_MPLAYER-yes) OBJS_MPLAYER += $(OBJS_MPLAYER-yes) ALL_PRG += $(ALL_PRG-yes) -MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) -MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) +MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) +MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man Modified: trunk/mpcommon.mak ============================================================================== --- trunk/mpcommon.mak (original) +++ trunk/mpcommon.mak Mon Apr 28 20:34:59 2008 @@ -10,19 +10,6 @@ OBJS_MENCODER += $(addsuffix .o, $(base CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) -LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER) -LIBS-$(MENCODER) += $(LIBNAME_MENCODER) -LIBS = $(LIBNAME_COMMON) $(LIBS-yes) - -libs: $(LIBS) - -$(LIBNAME_COMMON): $(OBJS_COMMON) -$(LIBNAME_MPLAYER): $(OBJS_MPLAYER) -$(LIBNAME_MENCODER): $(OBJS_MENCODER) -$(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(LIBNAME_MENCODER): - $(AR) r $@ $^ - $(RANLIB) $@ - %.d: %.c $(MPDEPEND_CMD) > $@ @@ -41,4 +28,4 @@ $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(L ALLHEADERS = $(wildcard *.h) checkheaders: $(ALLHEADERS:.h=.ho) -.PHONY: checkheaders libs *clean dep depend +.PHONY: checkheaders *clean dep depend

1 0

r26586 - trunk/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 20:12:45 2008 New Revision: 26586 Log: cosmetics: Reorder commands in (dist)clean targets. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 20:12:45 2008 @@ -812,16 +812,16 @@ uninstall: done clean: toolsclean + for part in $(PARTS); do $(MAKE) -C $$part clean; done + rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) - for part in $(PARTS); do $(MAKE) -C $$part clean; done - rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done - rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) + rm -f configure.log config.mak config.h strip: strip -s $(ALL_PRG)

1 0

r26585 - trunk/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 20:12:07 2008 New Revision: 26585 Log: Remove '-' prefix from 'rm -f' commands for consistency. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 20:12:07 2008 @@ -812,7 +812,7 @@ uninstall: done clean: toolsclean - -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ + rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) for part in $(PARTS); do $(MAKE) -C $$part clean; done @@ -820,7 +820,7 @@ clean: toolsclean distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done - -rm -f configure.log config.mak config.h + rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) strip:

1 0

r26584 - trunk/mpcommon.mak
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 19:57:44 2008 New Revision: 26584 Log: Mark phony checkheaders target as such. Modified: trunk/mpcommon.mak Modified: trunk/mpcommon.mak ============================================================================== --- trunk/mpcommon.mak (original) +++ trunk/mpcommon.mak Mon Apr 28 19:57:44 2008 @@ -41,4 +41,4 @@ $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(L ALLHEADERS = $(wildcard *.h) checkheaders: $(ALLHEADERS:.h=.ho) -.PHONY: libs *clean dep depend +.PHONY: checkheaders libs *clean dep depend

1 0

r26583 - in trunk: Makefile mpcommon.mak
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 19:54:14 2008 New Revision: 26583 Log: Merge now redundant clean and distclean rules into the top-level Makefile. Modified: trunk/Makefile trunk/mpcommon.mak Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 19:54:14 2008 @@ -640,7 +640,8 @@ PARTS = libavcodec \ libpostproc \ libswscale \ -DIRS = dvdread \ +DIRS = . \ + dvdread \ gui \ gui/mplayer \ gui/mplayer/gtk \ @@ -810,14 +811,14 @@ uninstall: fi ; \ done -clean:: toolsclean +clean: toolsclean -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) for part in $(PARTS); do $(MAKE) -C $$part clean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) -distclean:: doxygen_clean +distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done -rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) Modified: trunk/mpcommon.mak ============================================================================== --- trunk/mpcommon.mak (original) +++ trunk/mpcommon.mak Mon Apr 28 19:54:14 2008 @@ -23,12 +23,6 @@ $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(L $(AR) r $@ $^ $(RANLIB) $@ -clean:: - rm -f *.o *.a *.ho *~ - -distclean:: clean - rm -f *.d test test2 - %.d: %.c $(MPDEPEND_CMD) > $@

1 0

r26582 - trunk/osdep/timer-darwin.c
by ulion 28 Apr '08

28 Apr '08

Author: ulion Date: Mon Apr 28 17:57:31 2008 New Revision: 26582 Log: Force to uint64_t first to avoid direct convertion from double to unsigned int. Modified: trunk/osdep/timer-darwin.c Modified: trunk/osdep/timer-darwin.c ============================================================================== --- trunk/osdep/timer-darwin.c (original) +++ trunk/osdep/timer-darwin.c Mon Apr 28 17:57:31 2008 @@ -54,15 +54,13 @@ int usec_sleep(int usec_delay) /* current time in microseconds */ unsigned int GetTimer() { - return (unsigned int)((mach_absolute_time() * timebase_ratio - startup_time) - * 1e6); + return (unsigned int)(uint64_t)((mach_absolute_time() * timebase_ratio - startup_time) * 1e6); } /* current time in milliseconds */ unsigned int GetTimerMS() { - return (unsigned int)((mach_absolute_time() * timebase_ratio - startup_time) - * 1e3); + return (unsigned int)(uint64_t)((mach_absolute_time() * timebase_ratio - startup_time) * 1e3); } /* time spent between now and last call in seconds */

1 0