July 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/debian config,NONE,1.1 postinst,1.3,1.4 templates,NONE,1.1
by Dariush Pietrzak 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/debian In directory mplayer:/var/tmp.root/cvs-serv16155 Added Files: config postinst templates Log Message: update to perl debconf. fixed problem with configure. --- NEW FILE --- #!/usr/bin/perl -w # Script to configure mplayer # based on etherconf by John Goerzen <jgoerzen(a)progenylinux.com> use Debian::DebConf::Client::ConfModule qw(:all); my $version = version(2.0); title('MPlayer Configuration'); my $PRIORITY = 'high'; #TODO: 'medium' my $next = 'mainmenu'; my $isediting = 0; my @nextargs = (); checkupgrade(); # Find out if we have to upgrade. mainloop(letsgo()); sub checkupgrade { open(MCFG, "</etc/mplayer.conf") || return 1; my $line = <MCFG>; return 1 if ($line =~ /mplayer DEBCONF AREA/); exit(0) if (input($PRIORITY, 'mplayer/replace-existing-files') eq "question skipped"); go(); if (get('mplayer/replace-existing-files') eq 'false') { input($PRIORITY, 'mplayer/replace-existing-files-bail'); go(); exit(); } close MCFG; } sub mainloop { $next = shift @_; do { my @retval = &$next(@nextargs); # if ($retval[0] eq 'BACK') { # $retval[0] = $backups{$next}; # } ($next, @nextargs) = @retval; } while ($next ne 'Exit'); } sub letsgo { #useless! return "configure"; } sub configure { subst("mplayer/voutput", "vochoices", "xv, xmga, mga, x11, gl, sdl"); # db_subst mplayer/output vo xc,xmga,mga,x11,gl,sdl exit(0) if (input($PRIORITY, "mplayer/voutput") eq "question skipped"); go(); exit 0 unless (get("mplayer/voutput") eq 'true'); #return 'audioout'; return 'mainmenu'; } sub mainmenu { go(); # To catch spare things from before my @choices = ( 'Video Output: ' . scalar(get("mplayer/voutput"))); #, $choices = join(', ', @choices); $isediting = 1; subst('mplayer/mainmenu', 'choices', $choices); input($PRIORITY, 'mplayer/mainmenu'); go(); my $selection = get('mplayer/mainmenu'); if ($selection =~ /^Exit/) { return 'Exit'; } # Set to redisplay. fset('mplayer/mainmenu', 'isdefault', 'true'); $_ = $selection; return 'configure' if /^Video/; # return 'aoutput' if /^Aoutput/; return 'Exit'; } sub editreturn { my @args = @_; return 'mainmenu' if $isediting; return @args; } sub editfix { my $template = shift @_; if ($isediting) { fset($template, 'isdefault', 'true'); } } --- NEW FILE --- Template: mplayer/replace-existing-files Type: boolean Default: true Description: Upgrade existing system? It looks like you've configured your mplayer already. If you'd like to configure it with this program, I'll have to delete the old configuration. Do you want to continue configuration with this program? If you say "yes", I'll go ahead and delete your old configuration and you can create it anew with this program. Template: mplayer/replace-existing-files-bail Type: note Description: Files not replaced I'm going to exit now since you don't want me to replace your existing files. If you change your mind later, you can run dpkg-reconfigure mplayer. Template: mplayer/mainmenu Type: select Choices: ${choices}, Exit Description: MPlayer Main Menu From this menu, you can modify any of the settings for your device. Simply select the item you'd like to change to modify it. When you are done, select Exit. Template: mplayer/voutput Type: select Choices: ${vochoices}, x11 Description: MPlayer Video Output Yada yada..

1 0

CVS: main/debian TODO.Debian,1.3,1.4 changelog,1.4,1.5 control,1.3,1.4 rules,1.6,1.7
by Dariush Pietrzak 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/debian In directory mplayer:/var/tmp.root/cvs-serv16057 Modified Files: TODO.Debian changelog control rules Log Message: using debhelper instead of hardcoded stuff Index: TODO.Debian =================================================================== RCS file: /cvsroot/mplayer/main/debian/TODO.Debian,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TODO.Debian 26 Jun 2001 08:50:39 -0000 1.3 +++ TODO.Debian 28 Jul 2001 07:53:11 -0000 1.4 @@ -1,3 +1,4 @@ +- create packages of mp_font3 and win32codecs, depend/recommend them. - fibmap_mplayer - figure out what to do with suid. - global configuration ( /etc/mplayer/mplayer.conf @@ -7,5 +8,3 @@ or figure out some other way of satisfying other dependencies like *.dlls and fonts. In other words - automate win32dll.zip installation. -- check debhelper quirks and abilities for config files. - Index: changelog =================================================================== RCS file: /cvsroot/mplayer/main/debian/changelog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- changelog 25 Jun 2001 14:07:52 -0000 1.4 +++ changelog 28 Jul 2001 07:53:11 -0000 1.5 @@ -1,3 +1,9 @@ +mplayer (0.18-2) unstable; urgency=low + + * modified debian scripts + + -- Dariush Pietrzak <eyck(a)ghost.tinet.pl> Fri, 27 Jul 2001 09:25:52 +0200 + mplayer (0.18-1) unstable; urgency=low * lots of changes in mplayer Index: control =================================================================== RCS file: /cvsroot/mplayer/main/debian/control,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- control 26 Jun 2001 08:50:39 -0000 1.3 +++ control 28 Jul 2001 07:53:11 -0000 1.4 @@ -6,7 +6,7 @@ Package: mplayer Architecture: any -Depends: ${shlibs:Depends},debconf +Depends: ${shlibs:Depends},debconf,libconfhelper-perl Description: The Ultimate Movie Player For Linux MPlayer is a movie player for LINUX. It plays most MPEG, AVI and ASF files, supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even Index: rules =================================================================== RCS file: /cvsroot/mplayer/main/debian/rules,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rules 26 Jun 2001 11:12:27 -0000 1.6 +++ rules 28 Jul 2001 07:53:11 -0000 1.7 @@ -1,55 +1,112 @@ #!/usr/bin/make -f # Made with the aid of debmake, by Christoph Lameter, # based on the sample debian/rules file for GNU hello by Ian Jackson. +#export DH_VERBOSE=1 +# This is the debhelper compatability version to use. +export DH_COMPAT=1 package=mplayer -build: +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. $(checkdir) ./configure --prefix=/usr + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + #$(MAKE) + #/usr/bin/docbook-to-man debian/etherconf.sgml > etherconf.1 make dep make mplayer - touch build + + + touch build-stamp clean: - $(checkdir) - -rm -f build - -$(MAKE) distclean - -rm -f `find . -name "*~"` - -rm -rf debian/tmp debian/files* core debian/substvars + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + #-$(MAKE) clean +# $(checkdir) +# -rm -f build +# -$(MAKE) distclean +# -rm -f `find . -name "*~"` +# -rm -rf debian/tmp debian/files* core debian/substvars + dh_clean -binary-indep: checkroot build - $(checkdir) -# There are no architecture-independent files to be uploaded -# generated by this package. If there were any they would be -# made here. +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -binary-arch: checkroot build - $(checkdir) - -rm -rf debian/tmp - install -d debian/tmp - cd debian/tmp && install -d `cat ../dirs` + # Add here commands to install the package into debian/<packagename> +# $(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install $(MAKE) install prefix=`pwd`/debian/tmp/usr +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron + dh_installman + dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb + dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + + + +#binary-arch: checkroot build +# $(checkdir) +# -rm -rf debian/tmp +# install -d debian/tmp +# cd debian/tmp && install -d `cat ../dirs` + # Must have debmake installed for this to work. Otherwise please copy # /usr/bin/debstd into the debian directory and change debstd to debian/debstd - debstd - dpkg-gencontrol -isp - chown -R root.root debian/tmp - chmod -R go=rX debian/tmp - dpkg --build debian/tmp .. - -define checkdir - test -f debian/rules -endef +# debstd +# dpkg-gencontrol -isp +# chown -R root.root debian/tmp +# chmod -R go=rX debian/tmp +# dpkg --build debian/tmp .. binary: binary-indep binary-arch - -checkroot: - $(checkdir) - test root = "`whoami`" .PHONY: binary binary-arch binary-indep clean checkroot

1 0

CVS: main/libvo vo_sdl.c,1.50,1.51
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv12362/libvo Modified Files: vo_sdl.c Log Message: Added double/normal resize patch by Wojtek Kaniewski <wojtekka at bydg.pdi.net> Index: vo_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- vo_sdl.c 27 Jun 2001 11:40:14 -0000 1.50 +++ vo_sdl.c 28 Jul 2001 05:54:02 -0000 1.51 @@ -1082,6 +1082,24 @@ if(verbose > 1) printf("SDL: Set fullscreen mode\n"); } } + + else if ( keypressed == SDLK_n ) { + if (priv->surface->w != priv->width || priv->surface->h != priv->height) { + priv->surface = SDL_SetVideoMode(priv->width, priv->height, priv->bpp, priv->sdlflags); + priv->windowsize.w = priv->surface->w; + priv->windowsize.h = priv->surface->h; + if(verbose > 1) printf("SDL: Normal size\n"); + } + } + + else if ( keypressed == SDLK_d ) { + if (priv->surface->w != priv->width * 2 || priv->surface->h != priv->height * 2) { + priv->surface = SDL_SetVideoMode(priv->width * 2, priv->height * 2, priv->bpp, priv->sdlflags); + priv->windowsize.w = priv->surface->w; + priv->windowsize.h = priv->surface->h; + if(verbose > 1) printf("SDL: Double size\n"); + } + } else switch(keypressed){ case SDLK_RETURN:

1 0

CVS: main/DOCS SDL,1.5,1.6
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv12362/DOCS Modified Files: SDL Log Message: Added double/normal resize patch by Wojtek Kaniewski <wojtekka at bydg.pdi.net> Index: SDL =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/SDL,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SDL 24 Jun 2001 21:12:17 -0000 1.5 +++ SDL 28 Jul 2001 05:54:02 -0000 1.6 @@ -11,6 +11,8 @@ F toggles fullscreen/windowed mode C cycles available fullscreen modes W/S mappings for * and / (mixer control) +N sets normal size +D sets double size KNOWN BUGS: - Keys pressed under aalib console driver repeat forever. @@ -20,4 +22,4 @@ mailinglist. -- -Felix Bünemann, 2001-06-24 +Felix Bünemann, 2001-07-28

1 0

CVS: main/libavcodec Makefile,1.5,1.6
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/libavcodec In directory mplayer:/var/tmp.root/cvs-serv11397/libavcodec Modified Files: Makefile Log Message: Added StrongARM crosscompiling support by Maksim Krasnyanskiy <maxk at qualcomm.com> and fixed a --datadir bug in configure. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libavcodec/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 12 Jul 2001 16:20:19 -0000 1.5 +++ Makefile 28 Jul 2001 05:36:45 -0000 1.6 @@ -5,7 +5,6 @@ CFLAGS= $(OPTFLAGS) -Wall LDFLAGS= -g -# CC=gcc OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \ mpegaudio.o ac3enc.o mjpegenc.o resample.o dsputil.o \

1 0

CVS: main/TVout/fbset Makefile,1.1.1.1,1.2
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/TVout/fbset In directory mplayer:/var/tmp.root/cvs-serv11397/TVout/fbset Modified Files: Makefile Log Message: Added StrongARM crosscompiling support by Maksim Krasnyanskiy <maxk at qualcomm.com> and fixed a --datadir bug in configure. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/TVout/fbset/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 24 Feb 2001 20:28:55 -0000 1.1.1.1 +++ Makefile 28 Jul 2001 05:36:44 -0000 1.2 @@ -2,7 +2,7 @@ # Linux Frame Buffer Device Configuration # -CC = gcc -Wall -O2 -I. +CC = $(CC) -Wall -O2 -I. BISON = bison -d FLEX = flex INSTALL = install

1 0

CVS: main/TOOLS/mpfc Makefile,1.1,1.2
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/TOOLS/mpfc In directory mplayer:/var/tmp.root/cvs-serv11397/TOOLS/mpfc Modified Files: Makefile Log Message: Added StrongARM crosscompiling support by Maksim Krasnyanskiy <maxk at qualcomm.com> and fixed a --datadir bug in configure. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/mpfc/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 17 Jun 2001 23:58:37 -0000 1.1 +++ Makefile 28 Jul 2001 05:36:44 -0000 1.2 @@ -6,10 +6,10 @@ all: $(TARGET) mpfc-ce: mpfc-ce.c - gcc -Wall -O2 -o $@ $< $(LIBS) + $(CC) -Wall -O2 -o $@ $< $(LIBS) mpfc-kr: mpfc-kr.c - gcc -Wall -O2 -o $@ $< $(LIBS) + $(CC) -Wall -O2 -o $@ $< $(LIBS) clean: -rm -f $(TARGET)

1 0

CVS: main/drivers/syncfb Makefile,1.2,1.3
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/drivers/syncfb In directory mplayer:/var/tmp.root/cvs-serv11397/drivers/syncfb Modified Files: Makefile Log Message: Added StrongARM crosscompiling support by Maksim Krasnyanskiy <maxk at qualcomm.com> and fixed a --datadir bug in configure. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/drivers/syncfb/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 15 Apr 2001 18:35:17 -0000 1.2 +++ Makefile 28 Jul 2001 05:36:45 -0000 1.3 @@ -9,13 +9,9 @@ OBJ = syncfb_base.o syncfb_matrox.o syncfb_generic.o all: syncfb.o syncfb_test syncfb_off -CC = gcc - - syncfb.o : syncfb_matrox.o syncfb_generic.o syncfb_base.o $(LD) -r $^ -o $@ - syncfb_test: syncfb_test.c $(CC) -g -O -Wall $(X11DIR) -lX11 $(INCLUDES) -o $@ $@.c @@ -28,6 +24,8 @@ clean: rm -f *.o rm -f syncfb_test syncfbtv syncfb_off + +dep: distclean: clean rm -f *~

1 0

CVS: main/drivers Makefile,1.2,1.3
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main/drivers In directory mplayer:/var/tmp.root/cvs-serv11397/drivers Modified Files: Makefile Log Message: Added StrongARM crosscompiling support by Maksim Krasnyanskiy <maxk at qualcomm.com> and fixed a --datadir bug in configure. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/drivers/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 8 Mar 2001 01:06:59 -0000 1.2 +++ Makefile 28 Jul 2001 05:36:45 -0000 1.3 @@ -1,5 +1,4 @@ -CC = gcc KERNEL_INCLUDES = /usr/src/linux/include INCLUDES = -I$(KERNEL_INCLUDES) CFLAGS = -g -O2 -Wall -D__KERNEL__ -DMODULE -include $(KERNEL_INCLUDES)/linux/modversions.h @@ -15,6 +14,8 @@ mga_vid_test: mga_vid_test.c $(CC) -g -O -Wall $(INCLUDES) -o $@ $@.c + +dep: clean: rm -f *.o *~

1 0

CVS: main Makefile,1.57,1.58 configure,1.115,1.116
by Atmosfear 28 Jul '01

28 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv11397 Modified Files: Makefile configure Log Message: Added StrongARM crosscompiling support by Maksim Krasnyanskiy <maxk at qualcomm.com> and fixed a --datadir bug in configure. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- Makefile 21 Jul 2001 22:38:11 -0000 1.57 +++ Makefile 28 Jul 2001 05:36:44 -0000 1.58 @@ -22,7 +22,10 @@ A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) VO_LIBS = -Llibvo -lvo $(X_LIBS) +PARTS = mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 drivers drivers/syncfb + ifeq ($(TARGET_ARCH_X86),yes) +PARTS += loader loader/DirectShow SRCS += dll_init.c LOADER_DEP = loader/libloader.a $(DS_DEP) LIB_LOADER = -Lloader -lloader $(DS_LIB) @@ -42,7 +45,7 @@ .c.o: $(CC) -c $(CFLAGS) -o $@ $< -COMMONLIBS = libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a +COMMONLIBS = libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a encore/libencore.a loader/libloader.a: $(MAKE) -C loader @@ -75,10 +78,9 @@ $(MAKE) -C encore -MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a - +MPLAYER_DEP = mplayer.o $(OBJS) $(LOADER_DEP) $(AV_DEP) $(COMMONLIBS) mplayerwithoutlink: $(MPLAYER_DEP) - @for a in mp3lib libac3 libmpeg2 libvo opendivx libavcodec encore loader/DirectShow ; do $(MAKE) -C $$a all ; done + @for a in $(PARTS); do $(MAKE) -C $$a all ; done $(PRG): $(MPLAYER_DEP) $(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) $(LIB_LOADER) $(AV_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(VO_LIBS) $(CSS_LIB) -Lencore -lencore $(DECORE_LIBS) $(ARCH_LIBS) @@ -102,7 +104,7 @@ # finish before be can start builing new object files. $(MPLAYER_DEP): version.h -$(PRG_CFG): version.h codec-cfg.c codec-cfg.h +$(PRG_CFG): version.h codec-cfg.c codec-cfg.h $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML install: $(PRG) $(PRG_FIBMAP) @@ -120,23 +122,15 @@ rm -f *.o *~ $(OBJS) distclean: - @for a in mp3lib libac3 libmpeg2 opendivx libavcodec encore libvo libao2 loader loader/DirectShow drivers drivers/syncfb ; do \ - if [ -d $$a ] ; then \ - $(MAKE) -C $$a distclean ; \ - fi; \ - done rm -f *~ $(PRG) $(PRG_FIBMAP) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend + @for a in $(PARTS); do $(MAKE) -C $$a distclean; done dep: depend depend: ./version.sh $(CC) -MM $(CFLAGS) mplayer.c $(SRCS) 1>.depend - @for a in mp3lib libac3 libmpeg2 libvo libao2 opendivx libavcodec encore loader/DirectShow ; do \ - if [ -d $$a ] ; then \ - $(MAKE) -C $$a dep ; \ - fi ; \ - done + @for a in $(PARTS); do $(MAKE) -C $$a dep; done # ./configure must be run if it changed in CVS config.h: configure @@ -162,5 +156,3 @@ ifneq ($(wildcard .depend),) include .depend endif - - Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- configure 25 Jul 2001 07:03:55 -0000 1.115 +++ configure 28 Jul 2001 05:36:44 -0000 1.116 @@ -116,6 +116,7 @@ params: --cc use this C compiler to build MPlayer [gcc] + --target=PLATFORM target platform (i386-linux, arm-linux, etc) --prefix=DIR use this prefix for installing mplayer [/usr/local] --datadir=DIR use this prefix for installing machine independent data [/usr/local/share/mplayer] @@ -181,41 +182,96 @@ fi done # for parm in ... +if [ "$CC" != "" ]; then + _cc=$CC +else + _cc=gcc +fi + +_as=auto +_x11=auto + +for ac_option; do + case "$ac_option" in + --target=*) + _target=`echo $ac_option | cut -d '=' -f 2` + ;; + --cc=*) + _cc=`echo $ac_option | cut -d '=' -f 2` + ;; + --as=*) + _as=`echo $ac_option | cut -d '=' -f 2` + ;; + --disable-gcc-checking) + _skip_cc_check=yes + ;; + --disable-as-checking) + _skip_as_check=yes + ;; + --with-x11libdir=*) + _x11libdir=-L`echo $ac_option | cut -d '=' -f 2` + ;; + --with-x11incdir=*) + _x11incdir=-I`echo $ac_option | cut -d '=' -f 2` + ;; + --enable-x11) + _x11=yes + ;; + --disable-x11) + _x11=no + ;; + --with-sdl-config=*) + _sdlconfig=`echo $ac_option | cut -d '=' -f 2` + ;; + --with-extralibdir=*) + _extralibdir=-L`echo $ac_option | cut -d '=' -f 2` + ;; + --with-extraincdir=*) + _extraincdir=-I`echo $ac_option | cut -d '=' -f 2` + ;; + esac +done # LGB: Some inital help echo "You can get detailed help on configure with: $0 --help" echo "Please wait while ./configure discovers your software and hardware environment!" - # Determine our OS name and CPU architecture - -system_name=`uname -s 2>&1` # name of operating system: Linux, FreeBSD, NetBSD, SunOS -host_arch=`uname -p 2>&1` # host's instruction set or processor type -case "$host_arch" in -i386|sparc|ppc|alpha) - # fine, uname -p output looks good, it has returned - # something this configure script recognizes - ;; - -*) # uname -p on Linux returns 'unknown' for the processor type, - # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)' - - # Maybe uname -m (machine hardware name) returns something we - # recognize. - - case "`uname -m 2>&1`" in - i[3-9]86) - host_arch=i386;; - ppc) - host_arch=ppc;; - alpha) - host_arch=alpha;; - sparc64) - host_arch=sparc;; - esac - ;; -esac +if [ "$_target" == "" ]; then + system_name=`uname -s 2>&1` # name of operating system: Linux, FreeBSD, NetBSD, SunOS + host_arch=`uname -p 2>&1` # host's instruction set or processor type + + case "$host_arch" in + i386|sparc|ppc|alpha|arm) + # fine, uname -p output looks good, it has returned + # something this configure script recognizes + ;; + + *) # uname -p on Linux returns 'unknown' for the processor type, + # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)' + + # Maybe uname -m (machine hardware name) returns something we + # recognize. + + case "`uname -m 2>&1`" in + i[3-9]86) + host_arch=i386;; + ppc) + host_arch=ppc;; + alpha) + host_arch=alpha;; + sparc*) + host_arch=sparc;; + arm*) + host_arch=arm;; + esac + ;; + esac +else + system_name=`echo $_target | cut -d '-' -f 2` + host_arch=`echo $_target | cut -d '-' -f 1` +fi # Determine OS dependent libs @@ -257,26 +313,24 @@ # --- Check for C compiler: -_cc=gcc -_as=auto -_x11=auto - -_x11libdir= -if [ -d /usr/X11R6 ]; then - _x11libdir=-L/usr/X11R6/lib -else - if [ -d /usr/X11 ]; then - _x11libdir=-L/usr/X11/lib - fi -fi - -_x11incdir= -if [ -d /usr/include/X11 ]; then - _x11incdir= -elif [ -d /usr/X11R6 ]; then - _x11incdir=-I/usr/X11R6/include -elif [ -d /usr/X11 ]; then - _x11incdir=-I/usr/X11/include +if [ "$_x11libdir" = "" ]; then + if [ -d /usr/X11R6 ]; then + _x11libdir=-L/usr/X11R6/lib + else + if [ -d /usr/X11 ]; then + _x11libdir=-L/usr/X11/lib + fi + fi +fi + +if [ "$_x11incdir" = "" ]; then + if [ -d /usr/include/X11 ]; then + _x11incdir= + elif [ -d /usr/X11R6 ]; then + _x11incdir=-I/usr/X11R6/include + elif [ -d /usr/X11 ]; then + _x11incdir=-I/usr/X11/include + fi fi # Lots of stuff are installed under /usr/local @@ -284,53 +338,12 @@ _extralibdir=-L/usr/local/lib _extraincdir=-I/usr/local/include -_skip_cc_check=no -_skip_as_check=no if [ "$system_name" = "FreeBSD" ]; then _sdlconfig='sdl11-config' else _sdlconfig='sdl-config' fi -for ac_option -do - case "$ac_option" in - --cc=*) - _cc=`echo $ac_option | cut -d '=' -f 2` - ;; - --as=*) - _as=`echo $ac_option | cut -d '=' -f 2` - ;; - --disable-gcc-checking) - _skip_cc_check=yes - ;; - --disable-as-checking) - _skip_as_check=yes - ;; - --with-x11libdir=*) - _x11libdir=-L`echo $ac_option | cut -d '=' -f 2` - ;; - --with-x11incdir=*) - _x11incdir=-I`echo $ac_option | cut -d '=' -f 2` - ;; - --enable-x11) - _x11=yes - ;; - --disable-x11) - _x11=no - ;; - --with-sdl-config=*) - _sdlconfig=`echo $ac_option | cut -d '=' -f 2` - ;; - --with-extralibdir=*) - _extralibdir=-L`echo $ac_option | cut -d '=' -f 2` - ;; - --with-extraincdir=*) - _extraincdir=-I`echo $ac_option | cut -d '=' -f 2` - ;; - esac -done - # --- # Checking CC version... @@ -645,6 +658,16 @@ _mcpu="-mcpu=$proc" ;; +arm) + _arch="#define ARCH_ARM 1" + _target_arch="TARGET_ARCH_ARM=yes" + _words_endian="#undef WORDS_BIGENDIAN" + iproc=arm + proc= + _march="" + _mcpu="" + ;; + # Untested: #ppc) # _arch="#define ARCH_PPC 1" @@ -919,10 +942,8 @@ # check for the parameters. _prefix="/usr/local" -_datadir=$_prefix"/share/mplayer" -for ac_option -do +for ac_option; do case "$ac_option" in --enable-profile) _profile='-p' @@ -1156,6 +1177,11 @@ esac done +# Atmos: moved this here, to be correct, if --prefix is specified +if test x"$_datadir" = x; then + _datadir=$_prefix"/share/mplayer" +fi + # Checking assembler (_as) compatibility... as_version=`$_as --version 2>&1 | sed -n 's/^.*assembler $[0-9.]*$.*$/\1/p'` echo $_echo_n "Checking assembler ($_as) ... $as_version, $_echo_c" @@ -1218,7 +1244,7 @@ else echo "failed" echo "Please upgrade(downgrade) binutils to "$_pref_as_version"..." - if [ $_skip_as_check = 'no' ]; then + if [ "$_skip_as_check" != "yes" ]; then exit else echo "YOU'VE SELECTED '--disable-as-checking'. PLEASE DON'T SEND US ANY BUGREPORTS!"

1 0