* ./plugins/ogg/*: added preliminary files for an Ogg/Vorbis decoder a
    contributor is currently working on.

ChangeLog

@@ -4,7 +4,14 @@
 
 HEAD
 
-  * fixed ./plugins/gtk/gtk_callbacks.c to use the dvd_device config option.
+  * ./plugins/ogg/*: added preliminary files for an Ogg/Vorbis decoder a
+    contributor is currently working on.
+  * ALL: removed libdvdcss from the vlc tree.
+  * ALL: removed libdvdread from the vlc tree.
+  * ./acconfig.h: removed this file.
+  * ./plugins/dvd/dummy_dvdcss.c: merged this file into dvd.c.
+  * ./AUTHORS: moved a few gentlemen to the libdvdcss AUTHORS file.
+  * ./plugins/gtk/gtk_callbacks.c: use the dvd_device config option.
   * ./po/ja.po: added Japanese translation from Fumio Nakayama
     <endymion@ca2.so-net.ne.jp>.
   * ./plugins/gtk/gtk_callbacks.c: fixed disc ejection code.

Makefile

@@ -49,6 +49,7 @@ PLUGINS_DIR :=	a52 \
 		mpeg_adec \
 		mpeg_vdec \
 		network \
+		ogg \
 		qnx \
 		qt \
 		satellite \
@@ -130,6 +131,7 @@ PLUGINS_TARGETS := a52/a52 \
 		mpeg_vdec/mpeg_vdec \
 		network/ipv4 \
 		network/ipv6 \
+		ogg/vorbis \
 		qnx/qnx \
 		qt/qt \
 		satellite/satellite \

Makefile.opts.in

@@ -103,6 +103,7 @@ LIB_QT = @LIB_QT@
 LIB_RC = @LIB_RC@
 LIB_SDL = @LIB_SDL@
 LIB_VCD = @LIB_VCD@
+LIB_VORBIS = @LIB_VORBIS@
 LIB_WAVEOUT = @LIB_WAVEOUT@
 LIB_WIN32 = @LIB_WIN32@
 LIB_X11 = @LIB_X11@

configure.in

@@ -704,7 +704,7 @@ dnl
 dnl  a52 AC3 decoder plugin
 dnl
 AC_ARG_ENABLE(a52,
-  [  --disable-a52           AC3 support with liba52 (default enabled)])
+  [  --enable-a52            AC3 support with liba52 (default enabled)])
 if test "x$enableval" != "xno" -a x$SYS != xmingw32
   then
     AC_CHECK_HEADERS(a52dec/a52.h, [
@@ -713,6 +713,19 @@ if test "x$enableval" != "xno" -a x$SYS != xmingw32
      ],[])
 fi
 
+dnl
+dnl  ogg vorbis plugin
+dnl
+AC_ARG_ENABLE(vorbis,
+  [  --enable-vorbis             Ogg/Vorbis decoder support (default enabled)])
+if test "x$enableval" != "xno"
+then
+  AC_CHECK_HEADERS(ogg/ogg.h, [
+    PLUGINS="${PLUGINS} vorbis"
+    LIB_VORBIS="${LIB_VORBIS} -lvorbis"
+   ],[])
+fi
+
 dnl
 dnl  Video plugins
 dnl
@@ -724,7 +737,7 @@ dnl  X11 module
 dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(x11,
-  [  --disable-x11           X11 support (default enabled)])
+  [  --enable-x11            X11 support (default enabled)])
 if test x$enable_x11 != xno &&
   (test x$SYS != xmingw32 || test x$enable_x11 = xyes); then
   if test x$x_includes = xNONE; then
@@ -748,7 +761,7 @@ dnl  XVideo module
 dnl  (enabled by default except on win32)
 dnl
 AC_ARG_ENABLE(xvideo,
-  [  --disable-xvideo        XVideo support (default enabled)])
+  [  --enable-xvideo         XVideo support (default enabled)])
 if test x$enable_xvideo != xno &&
   (test x$SYS != xmingw32 || test x$enable_xvideo = xyes); then
   if test x$x_includes = xNONE; then
@@ -780,7 +793,7 @@ dnl
 dnl  SDL module
 dnl
 AC_ARG_ENABLE(sdl,
-  [  --disable-sdl           SDL support (default enabled)])
+  [  --enable-sdl            SDL support (default enabled)])
 if test "x$enable_sdl" != "xno"
 then
   SDL_PATH=$PATH
@@ -1027,7 +1040,7 @@ dnl
 dnl  Gtk+ module
 dnl
 AC_ARG_ENABLE(gtk,
-  [  --disable-gtk           Gtk+ support (default enabled)])
+  [  --enable-gtk            Gtk+ support (default enabled)])
 if test x$enable_gtk != xno
 then
   GTK_PATH=$PATH
@@ -1422,6 +1435,7 @@ AC_SUBST(LIB_QT)
 AC_SUBST(LIB_RC)
 AC_SUBST(LIB_SDL)
 AC_SUBST(LIB_VCD)
+AC_SUBST(LIB_VORBIS)
 AC_SUBST(LIB_WAVEOUT)
 AC_SUBST(LIB_WIN32)
 AC_SUBST(LIB_X11)

include/defs.h.in

@@ -250,6 +250,9 @@
 /* Define if you have the <nl_types.h> header file.  */
 #undef HAVE_NL_TYPES_H
 
+/* Define if you have the <ogg/ogg.h> header file.  */
+#undef HAVE_OGG_OGG_H
+
 /* Define if you have the <pthread.h> header file.  */
 #undef HAVE_PTHREAD_H
 

plugins/ogg/.cvsignore

+.dep
+*.lo
+*.o.*
+*.lo.*

plugins/ogg/Makefile

+vorbis_SOURCES =