[MPlayer-dev-eng] [PATCH] rename internal libdvdread (dvdread->libdvdread)

[Dominik 'Rathann' Mierzejewski]

On Saturday, 30 August 2008 at 00:57, Dominik 'Rathann' Mierzejewski wrote:
> On Friday, 29 August 2008 at 23:35, Diego Biurrun wrote:
> > On Fri, Aug 29, 2008 at 11:23:21PM +0200, Dominik 'Rathann' Mierzejewski wrote:
> > > 
> > > At the end of May, Nico split libdvdread from libdvdnav in our
> > > libdvdnav fork. To avoid clashing with MPlayer's internal libdvdread,
> > > the include dir was set to /usr/include/libdvdread instead of
> > > /usr/include/dvdread and deviated from old upstream. The attached
> > > patch (with the addition of svn mv dvdread libdvdread) renames
> > > our internal libdvdread instead. I'm going to apply an appropriate
> > > patch to our libdvdread fork to complement this change if this
> > > is accepted.
> > 
> > I'm fine with this change, but Nico gets to decide.  I think it's
> > preferable to keep the hacks local so to speak.
> > 
> > > --- Makefile	(revision 27490)
> > > +++ Makefile	(working copy)
> > > @@ -655,7 +655,7 @@
> > >  
> > >  DIRS =  . \
> > > -        dvdread \
> > > +        libdvdread \
> > >          gui \
> > 
> > Please respect alphabetical order.
> 
> Fixed.
> 
> > > @@ -783,7 +783,7 @@
> > >  
> > > -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
> > > +libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
> > >  libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
> > 
> > same here
> 
> Fixed.
> 
> > Do not forget to update the Copyright file with the new location and
> 
> Fixed, updated patch attached.

Applied.

Regards,
R.

-- 
MPlayer http://mplayerhq.hu | Livna http://rpm.livna.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan