[MPlayer-dev-eng] fixes for mplayer needed on OpenBSD

[Björn Sandell]

On Mon, 12 Jul 2004 12:35:50 +0200
Diego Biurrun <diego at biurrun.de> wrote:

> Robert Nagy writes:
> > Moo. Diego asked me to post the patches here.
> > Have fun with them.
> > 
> > --- Makefile.orig	Tue Apr 13 13:22:37 2004
> > +++ Makefile	Mon Jul 12 00:51:31 2004
> > @@ -287,8 +287,6 @@
> >  	@echo "*** Download skin(s) at
> >  	http://www.mplayerhq.hu/homepage/dload.html"
> >  	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
> >  endif
> > -	@if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
> > -	@if test -f $(CONFDIR)/codecs.conf ; then mv -f
> > $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
> 
> This is wrong.  We put this check there for a reason.  codecs.conf
> causes lots of troubles when it is outdated.  Old versions that are
> kept through upgrades will make many movies fail with obscure error
> messages.

Yepp, this is a typical OpenBSD tweek. We don't install codecs.conf.
 
> > --- configure.orig	Mon Apr 26 11:44:06 2004
> > +++ configure	Mon Jul 12 00:51:31 2004
> > @@ -4991,7 +4991,7 @@
> >  
> >  echocheck "iconv"
> > -if test "$_iconv" = auto ; then
> > +if test "$_iconv" != no ; then
> 
> I don't know what purpose this serves, but it's wrong as it removes
> the distinction between yes and auto.

Ports tweek again; we gotta keep track of dependencies.
 
> The rest of the configure patch looks good, though, I'll apply it.
> 
> > --- loader/Makefile.orig	Thu Jan 29 13:01:26 2004
> > +++ loader/Makefile	Mon Jul 12 00:51:31 2004
> > @@ -32,9 +32,6 @@
> >  
> >  libloader.a:  $(LIB_OBJECTS) stubs.s
> >  	$(CC) -c ./stubs.s -o stubs.o
> > -ifeq ($(TARGET_OS),OpenBSD)
> > -	./loader_objfix.sh
> > -endif
> 
> Hmm, this reverses an old portability patch by Björn Sandell.  If it
> is no longer required in newer versions of OpenBSD then we should
> remove loader_objfix.sh as well.

Ports tweek again! :-) MPlayer developers wanted to be backwards compatile,
the ports system is not (by design).

-- 
Björn Sandell       DCE/DFS Sysadmin       IT department
Chalmers University of Technology    www.dce.chalmers.se