[MPlayer-dev-eng] [PATCH] rename internal libdvdread (dvdread->libdvdread)
Dominik 'Rathann' Mierzejewski
dominik at rangers.eu.org
Fri Aug 29 23:23:21 CEST 2008
Hi,
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.
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
-------------- next part --------------
Index: stream/stream_dvd_common.h
===================================================================
--- stream/stream_dvd_common.h (revision 27490)
+++ stream/stream_dvd_common.h (working copy)
@@ -4,9 +4,9 @@
#include "config.h"
#include <inttypes.h>
#ifdef CONFIG_DVDREAD_INTERNAL
+#include "libdvdread/ifo_types.h"
+#else
#include <dvdread/ifo_types.h>
-#else
-#include <libdvdread/ifo_types.h>
#endif
int mp_dvdtimetomsec(dvd_time_t *dt);
Index: stream/stream_dvd.h
===================================================================
--- stream/stream_dvd.h (revision 27490)
+++ stream/stream_dvd.h (working copy)
@@ -4,15 +4,15 @@
#include "config.h"
#include <stdint.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include "dvdread/dvd_reader.h"
-#include "dvdread/ifo_types.h"
-#include "dvdread/ifo_read.h"
-#include "dvdread/nav_read.h"
+#include "libdvdread/dvd_reader.h"
+#include "libdvdread/ifo_types.h"
+#include "libdvdread/ifo_read.h"
+#include "libdvdread/nav_read.h"
#else
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
#endif
#include "stream.h"
Index: Makefile
===================================================================
--- Makefile (revision 27490)
+++ Makefile (working copy)
@@ -236,15 +236,15 @@
SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c
SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \
stream/stream_dvd_common.c
-SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \
- dvdread/dvd_input.c \
- dvdread/dvd_reader.c \
- dvdread/dvd_udf.c \
- dvdread/ifo_print.c \
- dvdread/ifo_read.c \
- dvdread/md5.c \
- dvdread/nav_print.c \
- dvdread/nav_read.c \
+SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread/cmd_print.c \
+ libdvdread/dvd_input.c \
+ libdvdread/dvd_reader.c \
+ libdvdread/dvd_udf.c \
+ libdvdread/ifo_print.c \
+ libdvdread/ifo_read.c \
+ libdvdread/md5.c \
+ libdvdread/nav_print.c \
+ libdvdread/nav_read.c \
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
@@ -655,7 +655,7 @@
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
DIRS = . \
- dvdread \
+ libdvdread \
gui \
gui/mplayer \
gui/mplayer/gtk \
@@ -783,7 +783,7 @@
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
$(DEPS): help_mp.h
-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)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
Index: libdvdread/ifo_print.h
===================================================================
--- libdvdread/ifo_print.h (revision 27490)
+++ libdvdread/ifo_print.h (working copy)
@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
#ifdef __cplusplus
extern "C" {
Index: libdvdread/nav_print.h
===================================================================
--- libdvdread/nav_print.h (revision 27490)
+++ libdvdread/nav_print.h (working copy)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
/**
* Pretty printing of the NAV packets, PCI and DSI structs.
Index: libdvdread/ifo_types.h
===================================================================
--- libdvdread/ifo_types.h (revision 27490)
+++ libdvdread/ifo_types.h (working copy)
@@ -25,7 +25,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/dvd_reader.h>
#if defined(__BEOS__)
#if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H)
Index: libdvdread/nav_types.h
===================================================================
--- libdvdread/nav_types.h (revision 27490)
+++ libdvdread/nav_types.h (working copy)
@@ -30,7 +30,7 @@
* USA
*/
-#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
+#include <libdvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
/* If it's ever removed add a uintX_t test. */
#undef ATTRIBUTE_PACKED
Index: libdvdread/ifo_read.h
===================================================================
--- libdvdread/ifo_read.h (revision 27490)
+++ libdvdread/ifo_read.h (working copy)
@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
#ifdef __cplusplus
extern "C" {
Index: libdvdread/nav_read.h
===================================================================
--- libdvdread/nav_read.h (revision 27490)
+++ libdvdread/nav_read.h (working copy)
@@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
/**
* Parsing of NAV data, PCI and DSI parts.
Index: libdvdread/cmd_print.h
===================================================================
--- libdvdread/cmd_print.h (revision 27490)
+++ libdvdread/cmd_print.h (working copy)
@@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/ifo_types.h>
+#include <libdvdread/ifo_types.h>
/**
* Pretty printing of the DVD commands (vm instructions).
Index: configure
===================================================================
--- configure (revision 27490)
+++ configure (working copy)
@@ -5475,10 +5475,10 @@
if test "$_dl" = yes; then
cat > $TMPC << EOF
#include <inttypes.h>
-#include <libdvdread/dvd_reader.h>
-#include <libdvdread/ifo_types.h>
-#include <libdvdread/ifo_read.h>
-#include <libdvdread/nav_read.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
int main(void) { return 0; }
EOF
fi
More information about the MPlayer-dev-eng
mailing list