*** ./Gui/mplayer/gtk/fs.c.uw7 Sun Oct 22 15:32:24 2006 --- ./Gui/mplayer/gtk/fs.c Sat Nov 18 12:16:55 2006 *************** *** 59,66 **** { "WMA files (*.wma)", "*.wma" }, { "Matroska Audio files (*.mka)", "*.mka" }, { "Audio files", "*.wav,*.ogg,*.mp2,*.mp3,*.wma,*.mka" }, - { "Video files", "*.asf,*.avi,*.divx,*.fli,*.flc,*.ogm,*.mpg,*.mpeg,*.m1v,*.mov,*.nuv,*.qt,*.rm,*.vob,*.viv,*.wmv,*.mkv,*.bin" }, { "All files", "*" }, { NULL,NULL } }; int fsLastVideoFilterSelected = -1; --- 59,66 ---- { "WMA files (*.wma)", "*.wma" }, { "Matroska Audio files (*.mka)", "*.mka" }, { "Audio files", "*.wav,*.ogg,*.mp2,*.mp3,*.wma,*.mka" }, { "All files", "*" }, + { "Video files", "*.asf,*.avi,*.divx,*.fli,*.flc,*.ogm,*.mpg,*.mpeg,*.m1v,*.mov,*.nuv,*.qt,*.rm,*.vob,*.viv,*.wmv,*.mkv,*.bin" }, { NULL,NULL } }; int fsLastVideoFilterSelected = -1; *** ./libdha/Makefile.uw7 Sun Oct 22 15:32:26 2006 --- ./libdha/Makefile Sat Nov 18 12:16:55 2006 *************** *** 11,17 **** SHORTNAME = libdha.dll else SHORTNAME = libdha.so.$(MAJOR_VERSION) ! SONAME_FLAGS = -Wl,-soname,$(SHORTNAME) #SHORTNAME = libdha.so VSHORTNAME = libdha.so endif --- 11,17 ---- SHORTNAME = libdha.dll else SHORTNAME = libdha.so.$(MAJOR_VERSION) ! SONAME_FLAGS = -Wl,-h,$(SHORTNAME) #SHORTNAME = libdha.so VSHORTNAME = libdha.so endif *************** *** 56,62 **** $(AR) r $(LIBNAME) $(OBJS) else #$(CC) -shared $(SONAME_FLAGS) -o $(LIBNAME) $(OBJS) $(LIBS) ! $(CC) -shared -Wl,-soname -Wl,$(LIBNAME) -o $(LIBNAME) $(OBJS) $(LIBS) ln -sf $(LIBNAME) $(SHORTNAME) ln -sf $(LIBNAME) $(VSHORTNAME) endif --- 56,62 ---- $(AR) r $(LIBNAME) $(OBJS) else #$(CC) -shared $(SONAME_FLAGS) -o $(LIBNAME) $(OBJS) $(LIBS) ! $(CC) -shared -Wl,-h -Wl,$(LIBNAME) -o $(LIBNAME) $(OBJS) $(LIBS) ln -sf $(LIBNAME) $(SHORTNAME) ln -sf $(LIBNAME) $(VSHORTNAME) endif *************** *** 83,89 **** install: -mkdir -p $(LIBDIR) ! install -m 755 $(INSTALLSTRIP) -p $(LIBNAME) $(LIBDIR)/$(LIBNAME) rm -f $(LIBDIR)/libdha.so ln -sf $(LIBNAME) $(LIBDIR)/$(SHORTNAME) ifeq ($(TARGET_OS),OpenBSD) --- 83,89 ---- install: -mkdir -p $(LIBDIR) ! install -m 755 $(INSTALLSTRIP) $(LIBNAME) $(LIBDIR)/$(LIBNAME) rm -f $(LIBDIR)/libdha.so ln -sf $(LIBNAME) $(LIBDIR)/$(SHORTNAME) ifeq ($(TARGET_OS),OpenBSD) *** ./vidix/drivers/Makefile.uw7 Sun Oct 22 15:32:26 2006 --- ./vidix/drivers/Makefile Sat Nov 18 12:16:55 2006 *************** *** 24,30 **** $(CC) -c $(VIDIX_CFLAGS) -o $@ $< %.so: %.o ! $(CC) -shared $^ $(VIDIX_LIBS) -Wl,-soname,$@ -o $@ mga_crtc2_vid.o: mga_vid.c $(CC) -c $(MGA_CRTC2_CFLAGS) -o $@ $< --- 24,30 ---- $(CC) -c $(VIDIX_CFLAGS) -o $@ $< %.so: %.o ! $(CC) -shared $^ $(VIDIX_LIBS) -Wl,-h,$@ -o $@ mga_crtc2_vid.o: mga_vid.c $(CC) -c $(MGA_CRTC2_CFLAGS) -o $@ $< *************** *** 35,62 **** sis_vid.so: sis_vid.o sis_bridge.o radeon_vid.so: radeon_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_X) -Wl,-soname,$@ -o $@ rage128_vid.so: rage128_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_X) -Wl,-soname,$@ -o $@ cyberblade_vid.so: cyberblade_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-soname,$@ -o $@ nvidia_vid.so: nvidia_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-soname,$@ -o $@ mga_vid.so: mga_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-soname,$@ -o $@ mga_crtc2_vid.so: mga_crtc2_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-soname,$@ -o $@ unichrome_vid.so: unichrome_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-soname,$@ -o $@ savage_vid.so: savage_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-soname,$@ -o $@ clean: rm -f *.o *.so *~ --- 35,62 ---- sis_vid.so: sis_vid.o sis_bridge.o radeon_vid.so: radeon_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_X) -Wl,-h,$@ -o $@ rage128_vid.so: rage128_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_X) -Wl,-h,$@ -o $@ cyberblade_vid.so: cyberblade_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-h,$@ -o $@ nvidia_vid.so: nvidia_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-h,$@ -o $@ mga_vid.so: mga_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-h,$@ -o $@ mga_crtc2_vid.so: mga_crtc2_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-h,$@ -o $@ unichrome_vid.so: unichrome_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-h,$@ -o $@ savage_vid.so: savage_vid.o ! $(CC) -shared $< $(VIDIX_LIBS_M) -Wl,-h,$@ -o $@ clean: rm -f *.o *.so *~ *************** *** 71,77 **** install: mkdir -p $(LIBDIR)/mplayer/vidix ! -install -m 755 $(INSTALLSTRIP) -p *.so $(LIBDIR)/mplayer/vidix uninstall: rm -f $(LIBDIR)/mplayer/vidix/*.so -rmdir -p $(LIBDIR)/mplayer/vidix --- 71,77 ---- install: mkdir -p $(LIBDIR)/mplayer/vidix ! -install -m 755 $(INSTALLSTRIP) *.so $(LIBDIR)/mplayer/vidix uninstall: rm -f $(LIBDIR)/mplayer/vidix/*.so -rmdir -p $(LIBDIR)/mplayer/vidix *** ./TOOLS/subfont-c/runme.uw7 Sun Oct 22 15:32:29 2006 --- ./TOOLS/subfont-c/runme Sat Nov 18 12:16:55 2006 *************** *** 4,14 **** #font=arial.ttf #font=mints-mild.pcf #font=/home/alex/artwiz-mints-mild-latin2.hex ! font=$1 #font=verdana.ttf encoding=iso-8859-2 ! fontsize=$2 ! symbolssize=$3 blur=2 outline=1.5 --- 4,17 ---- #font=arial.ttf #font=mints-mild.pcf #font=/home/alex/artwiz-mints-mild-latin2.hex ! #font=$1 ! font=/usr/share/mplayer/font/subfont.ttf #font=verdana.ttf encoding=iso-8859-2 ! #fontsize=$2 ! fontsize=12 ! #symbolssize=$3 ! symbolssize=10 blur=2 outline=1.5 *** ./TOOLS/subfont-c/Makefile.uw7 Sun Oct 22 15:32:29 2006 --- ./TOOLS/subfont-c/Makefile Sat Nov 18 12:16:55 2006 *************** *** 3,10 **** include $(MPROOT)/config.mak ! LDLIBS=-lm $(MPROOT)/osdep/timer-lx.o $(shell freetype-config --libs) ! CFLAGS=$(OPTFLAGS) $(shell freetype-config --cflags) -I$(MPROOT) #CFLAGS+=-O0 # for RedHat's gcc-2.96-95 #CFLAGS+=-DOLD_FREETYPE2 # for FreeType 2.0.1 --- 3,11 ---- include $(MPROOT)/config.mak ! ICLIBS=/usr/local/lib/libiconv.a /usr/local/lib/libcharset.a ! LDLIBS=-lm $(MPROOT)/osdep/timer-lx.o $(ICLIBS) $(shell freetype-config --libs) ! CFLAGS=-I/usr/local/include $(OPTFLAGS) $(shell freetype-config --cflags) -I$(MPROOT) #CFLAGS+=-O0 # for RedHat's gcc-2.96-95 #CFLAGS+=-DOLD_FREETYPE2 # for FreeType 2.0.1 *** ./TOOLS/subfont-c/subfont.c.uw7 Sun Oct 22 15:32:29 2006 --- ./TOOLS/subfont-c/subfont.c Sat Nov 18 12:16:55 2006 *************** *** 75,82 **** #define eprintf(...) fprintf(stderr, ##__VA_ARGS__) ! #define ERROR(msg, ...) eprintf("%s: error: " msg "\n", command, ##__VA_ARGS__),exit(1) ! #define WARNING(msg, ...) eprintf("%s: warning: " msg "\n", command, ##__VA_ARGS__) #define f266ToInt(x) (((x)+32)>>6) // round fractional fixed point number to integer // coordinates are in 26.6 pixels (i.e. 1/64th of pixels) --- 75,84 ---- #define eprintf(...) fprintf(stderr, ##__VA_ARGS__) ! /* #define ERROR(msg, ...) eprintf("%s: error: " msg "\n", command, ##__VA_ARGS__),exit(1) */ ! #define ERROR(msg) fprintf(stderr, "error: " msg "\n"),exit(1) ! /* #define WARNING(msg, ...) eprintf("%s: warning: " msg "\n", command, ##__VA_ARGS__) */ ! #define WARNING(msg) fprintf(stderr, "warning: " msg "\n") #define f266ToInt(x) (((x)+32)>>6) // round fractional fixed point number to integer // coordinates are in 26.6 pixels (i.e. 1/64th of pixels) *************** *** 157,163 **** error = FT_Init_FreeType(&library); if (error) ERROR("Init_FreeType failed."); error = FT_New_Face(library, font_path, 0, &face); ! if (error) ERROR("New_Face failed. Maybe the font path `%s' is wrong.", font_path); /* if (font_metrics) { --- 159,165 ---- error = FT_Init_FreeType(&library); if (error) ERROR("Init_FreeType failed."); error = FT_New_Face(library, font_path, 0, &face); ! if (error) ERROR("New_Face failed. Maybe the font path is wrong."); /* if (font_metrics) { *************** *** 218,224 **** jppem = face->available_sizes[i].height; } } ! WARNING("Selected font is not scalable. Using ppem=%i.", face->available_sizes[j].height); error = FT_Set_Pixel_Sizes(face, face->available_sizes[j].width, face->available_sizes[j].height); if (error) WARNING("FT_Set_Pixel_Sizes failed."); } --- 220,226 ---- jppem = face->available_sizes[i].height; } } ! WARNING("Selected font is not scalable."); error = FT_Set_Pixel_Sizes(face, face->available_sizes[j].width, face->available_sizes[j].height); if (error) WARNING("FT_Set_Pixel_Sizes failed."); } *************** *** 300,307 **** else { glyph_index = FT_Get_Char_Index(face, uni_charmap ? character:code); if (glyph_index==0) { ! WARNING("Glyph for char 0x%02lx|U+%04lX|%c not found.", code, character, ! code<' '||code>255 ? '.':(char)code); continue; } } --- 302,308 ---- else { glyph_index = FT_Get_Char_Index(face, uni_charmap ? character:code); if (glyph_index==0) { ! WARNING("Glyph for char not found."); continue; } } *************** *** 309,315 **** // load glyph error = FT_Load_Glyph(face, glyph_index, load_flags); if (error) { ! WARNING("FT_Load_Glyph 0x%02x (char 0x%02lx|U+%04lX) failed.", glyph_index, code, character); continue; } slot = face->glyph; --- 310,316 ---- // load glyph error = FT_Load_Glyph(face, glyph_index, load_flags); if (error) { ! WARNING("FT_Load_Glyph failed."); continue; } slot = face->glyph; *************** *** 318,324 **** if (slot->format != ft_glyph_format_bitmap) { error = FT_Render_Glyph(slot, ft_render_mode_normal); if (error) { ! WARNING("FT_Render_Glyph 0x%04x (char 0x%02lx|U+%04lX) failed.", glyph_index, code, character); continue; } } --- 319,325 ---- if (slot->format != ft_glyph_format_bitmap) { error = FT_Render_Glyph(slot, ft_render_mode_normal); if (error) { ! WARNING("FT_Render_Glyph failed."); continue; } } *************** *** 326,332 **** // extract glyph image error = FT_Get_Glyph(slot, (FT_Glyph*)&glyph); if (error) { ! WARNING("FT_Get_Glyph 0x%04x (char 0x%02lx|U+%04lX) failed.", glyph_index, code, character); continue; } glyphs[glyphs_count++] = (FT_Glyph)glyph; --- 327,333 ---- // extract glyph image error = FT_Get_Glyph(slot, (FT_Glyph*)&glyph); if (error) { ! WARNING("FT_Get_Glyph failed."); continue; } glyphs[glyphs_count++] = (FT_Glyph)glyph; *************** *** 453,463 **** int count = 0; // check if ucs-4 is available cd = iconv_open(charmap, charmap); ! if (cd==(iconv_t)-1) ERROR("iconv doesn't know %s encoding. Use the source!", charmap); iconv_close(cd); cd = iconv_open(charmap, encoding); ! if (cd==(iconv_t)-1) ERROR("Unsupported encoding `%s', use iconv --list to list character sets known on your system.", encoding); charset_size = 256 - first_char; for (i = 0; i + #else #include + #endif #include /* solaris x86: add missing prototype for sysi86() */ *** ./loader/win32.c.uw7 Sun Oct 22 15:32:30 2006 --- ./loader/win32.c Sat Nov 18 12:16:55 2006 *************** *** 70,76 **** --- 70,78 ---- #endif #if HAVE_VSSCANF + #ifndef SYSV5 int vsscanf( const char *str, const char *format, va_list ap); + #endif #else /* system has no vsscanf. try to provide one */ static int vsscanf( const char *str, const char *format, va_list ap) *** ./configure.uw7 Sun Oct 22 15:32:31 2006 --- ./configure Sat Nov 18 12:16:55 2006 *************** *** 1,4 **** ! #! /bin/sh # # Original version (C) 2000 Pontscho/fresh!mindworkz # pontscho@makacs.poliod.hu --- 1,4 ---- ! #! /bin/bash # # Original version (C) 2000 Pontscho/fresh!mindworkz # pontscho@makacs.poliod.hu *************** *** 97,102 **** --- 97,103 ---- test "`echo $system_name | tr A-Z a-z`" = "`echo $1 | tr A-Z a-z`" } linux() { issystem "Linux" ; return "$?" ; } + sco() { issystem "SCO" ; return "$?" ; } sunos() { issystem "SunOS" ; return "$?" ; } hpux() { issystem "HP-UX" ; return "$?" ; } irix() { issystem "IRIX" ; return "$?" ; } *************** *** 569,574 **** --- 570,578 ---- HP-UX*) system_name=HP-UX ;; + UnixWare*) + system_name=SCO + ;; [cC][yY][gG][wW][iI][nN]*) system_name=CYGWIN ;; *************** *** 586,591 **** --- 590,598 ---- case "$host_arch" in i386|sparc|ppc|alpha|arm|mips|vax) ;; + x86at) + host_arch=i386 + ;; powerpc) # Darwin returns 'powerpc' host_arch=ppc ;; *************** *** 625,630 **** --- 632,638 ---- system_name=`echo $_target | cut -d '-' -f 2` case "`echo $system_name | tr A-Z a-z`" in linux) system_name=Linux ;; + sco) system_name=SCO ;; freebsd) system_name=FreeBSD ;; netbsd) system_name=NetBSD ;; bsd/os) system_name=BSD/OS ;; *************** *** 795,802 **** EOF - read _answer - fi echocheck "host cc" test "$_host_cc" || _host_cc=$_cc --- 803,808 ---- *************** *** 3794,3800 **** echocheck "X11 headers presence" ! for I in `echo $_inc_extra | sed s/-I//g` /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do if test -f "$I/X11/Xlib.h" ; then _inc_x11="-I$I" _x11_headers="yes" --- 3800,3806 ---- echocheck "X11 headers presence" ! for I in `echo $_inc_extra | sed s/-I//g` /usr/X/include /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do if test -f "$I/X11/Xlib.h" ; then _inc_x11="-I$I" _x11_headers="yes" *************** *** 3819,3825 **** #include int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; } EOF ! for I in $_ld_x11 "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \ -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do _ld_x11="$I -lXext -lX11 $_ld_sock $_ld_pthread" if netbsd; then --- 3825,3831 ---- #include int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; } EOF ! for I in $_ld_x11 "" -L/usr/X/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \ -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do _ld_x11="$I -lXext -lX11 $_ld_sock $_ld_pthread" if netbsd; then *************** *** 5177,5183 **** echocheck "DVD support (libmpdvdkit2)" if test "$_mpdvdkit" = auto ; then _mpdvdkit=no ! if linux || freebsd || netbsd || darwin || openbsd || win32 || sunos || hpux; then test -f "./libmpdvdkit2/Makefile" && _mpdvdkit=yes fi fi --- 5183,5189 ---- echocheck "DVD support (libmpdvdkit2)" if test "$_mpdvdkit" = auto ; then _mpdvdkit=no ! if sco || linux || freebsd || netbsd || darwin || openbsd || win32 || sunos || hpux; then test -f "./libmpdvdkit2/Makefile" && _mpdvdkit=yes fi fi *************** *** 7213,7218 **** --- 7219,7227 ---- # use flag for HPUX missing setenv() CFLAGS="$CFLAGS -DHPUX" fi + if sco ; then + CFLAGS="$CFLAGS -D_REENTRANT -DSYSV5 -D__SVR4 -DSVR4 -DSCO" + fi # Thread support if linux ; then CFLAGS="$CFLAGS -D_REENTRANT" *************** *** 7293,7299 **** # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) _ld_dl_dynamic='' bsd && _ld_dl_dynamic='-rdynamic' ! if test "$_real" = yes || test "$_xanim" = yes && not win32 && not qnx && not darwin ; then _ld_dl_dynamic='-rdynamic' fi --- 7302,7308 ---- # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) _ld_dl_dynamic='' bsd && _ld_dl_dynamic='-rdynamic' ! if test "$_real" = yes || test "$_xanim" = yes && not win32 && not qnx && not darwin && not sco ; then _ld_dl_dynamic='-rdynamic' fi *************** *** 8161,8166 **** --- 8170,8178 ---- #elif defined(__FreeBSD__) #define DEFAULT_CDROM_DEVICE "/dev/acd0" #define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE + #elif defined(__UNIXWARE__) + #define DEFAULT_CDROM_DEVICE "/dev/cdrom/cdrom1" + #define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE #else #define DEFAULT_CDROM_DEVICE "/dev/cdrom" #define DEFAULT_DVD_DEVICE "/dev/dvd" *** ./Build-UW7.uw7 Sat Nov 18 12:16:56 2006 --- ./Build-UW7 Sat Nov 18 14:49:36 2006 *************** *** 0 **** --- 1,46 ---- + #!/bin/sh + # + HOST=i386-sco-sysv5 + CFLAGS="-O2" + LDFLAGS="-lthread" + INSTALL=/usr/ucb/install + NM="nm -p" + M4=/usr/gnu/bin/m4 + SHELL=/bin/bash + CONFIG_SHELL=/bin/bash + PATH=/usr/gnu/bin:$PATH + + if [ "$1" = "-u" ] + then + CC="cc -Kpthread -Kalloca" + CXX="CC -Kpthread -Kalloca" + ac_cv_c_pipe=no + export ac_cv_c_pipe + else + CC="gcc -D_REENTRANT" + CXX="g++ -D_REENTRANT" + CFLAGS="$CFLAGS -Wall" + fi + ac_cv_sse_inline=no + export ac_cv_sse_inline + export CC CXX CFLAGS NM M4 INSTALL LDFLAGS SHELL CONFIG_SHELL PATH + FFMPEG_CFLAGS=-I/usr/include/ffmpeg + FFMPEG_LIBS="-lavcodec -lavformat -lavutil -lz" + POSTPROC_CFLAGS=-I/usr/include/postproc + POSTPROC_LIBS="-lavcodec -lavformat -lavutil -lpostproc -lz" + export FFMPEG_CFLAGS FFMPEG_LIBS POSTPROC_CFLAGS POSTPROC_LIBS + + #GUI=--enable-gui + GUI= + + rm -f mout-configure + CFLAGS= ./configure --prefix=/usr --confdir=/etc/mplayer $GUI \ + --cc=/usr/gnu/bin/gcc --as=/usr/gnu/bin/gas --charset=iso-8859-2 \ + --disable-gcc-check --with-codecsdir=/usr/share/codecs \ + --disable-directfb --disable-mmx --disable-sse --disable-mpdvdkit \ + --disable-iconv --disable-freetype 2>&1 | tee mout-configure + + MOUT=mout + [ "$1" ] && MOUT=mout-$1 + [ -f $MOUT ] && mv $MOUT $MOUT-prev + make $* 2>&1 | tee $MOUT *** ./Install-UW7.uw7 Sat Nov 18 12:16:56 2006 --- ./Install-UW7 Sat Nov 18 12:16:56 2006 *************** *** 0 **** --- 1,14 ---- + #!/bin/sh + + MOUT=mout-install + D=/u/tmp/mplayer + DESTDIR=$D + export DESTDIR + + [ -f $MOUT ] && mv $MOUT $MOUT-prev + [ -d $D ] && rm -rf $D + mkdir -p $D + make install DESTDIR=$D 2>&1 | tee $MOUT + + [ -d $D/etc/mplayer ] || mkdir -p $D/etc/mplayer + cp etc/example.conf $D/etc/mplayer/mplayer.conf