* Added proper Conflicts: rules in debian/control.

  * configure.in fixes for BSD/OS.

diff --git a/ChangeLog b/ChangeLog
index 70c0c09c6f2152cdf646b6fac2f031a4263e8a1b..d86d25609105804b4c878eb4c8ac47d916c4cdf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 HEAD
 
+  * Added proper Conflicts: rules in debian/control.
+  * configure.in fixes for BSD/OS.
   * Added BSD/OS libdvd by Steven M. Schultz <sms@TO.GD-ES.COM> in
     extras/BSDI_dvdioctl after he suggested us to do so. License is GPL.
   * ./configure now checks for an installed libdvd under BSD/OS and

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 13616124baedc0e7ea178f357e426895719bf801..e33ca4b3af915b87e5d09c96187cd04111b7033e 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -106,8 +106,7 @@ OBJ_LIBDVDCSS = @OBJ_LIBDVDCSS@
 # Other special cases
 #
 NEED_GETOPT = @NEED_GETOPT@
-NEED_BSDI_LIBDVD = @NEED_BSDI_LIBDVD@
-LOCAL_LIBDVDCSS = @LOCAL_LIBDVDCSS@
+NEED_LIBDVDCSS = @NEED_LIBDVDCSS@
 
 ###############################################################################
 # Configuration pre-processing

diff --git a/configure b/configure
index 391914c275b4ecfebd55fd8e010b777b3f50dba1..df7f32e8ee2c99fdd2767a15a504d15e6fb9a764 100755 (executable)
--- a/configure
+++ b/configure
@@ -3573,10 +3573,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #define DVD_STRUCT_IN_DVD_H 1
 EOF
 
-    LINUX_DVD_STRUCT=1
-    OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
     LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd"
-    CFLAGS_LIBDVDCSS="${CFLAGS_LIBDVDCSS} -I../BSDI_ioctl"
+    LINUX_DVD_STRUCT=1
   
 else
   rm -rf conftest*
@@ -3585,17 +3583,17 @@ else
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3589: checking for $ac_hdr" >&5
+echo "configure:3587: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3594 "configure"
+#line 3592 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3617,6 +3615,8 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 EOF
  
       NEED_BSDI_LIBDVD=1
+      OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
+      CFLAGS_LIBDVDCSS="${CFLAGS_LIBDVDCSS} -I../BSDI_ioctl"
       LINUX_DVD_STRUCT=1
     
 else
@@ -3880,7 +3880,7 @@ fi
 
 LIB="${LIB} ${THREAD_LIB}"
 
-LOCAL_LIBDVDCSS=0
+NEED_LIBDVDCSS=0
 STATIC_LIBDVDCSS=0
 DUMMY_LIBDVDCSS=0
 # Check whether --with-dvdcss or --without-dvdcss was given.
@@ -3891,7 +3891,7 @@ if test "${with_dvdcss+set}" = set; then
       # local libdvdcss, statically linked
       if test x${CAN_BUILD_LIBDVDCSS} = x1
       then
-        LOCAL_LIBDVDCSS=1
+        NEED_LIBDVDCSS=1
         STATIC_LIBDVDCSS=1
         BUILTINS="${BUILTINS} dvd"
         CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
@@ -3903,7 +3903,7 @@ if test "${with_dvdcss+set}" = set; then
       # local libdvdcss, dynamically linked
       if test x${CAN_BUILD_LIBDVDCSS} = x1
       then
-        LOCAL_LIBDVDCSS=1
+        NEED_LIBDVDCSS=1
         BUILTINS="${BUILTINS} dvd"
         CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
         LIB_DVD="${LIB_DVD} -Llib -ldvdcss"
@@ -3936,7 +3936,7 @@ else
   # if libdvdcss is in the archive, or to use the dummy replacement otherwise.
    if test x${CAN_BUILD_LIBDVDCSS} = x1
     then
-      LOCAL_LIBDVDCSS=1
+      NEED_LIBDVDCSS=1
       STATIC_LIBDVDCSS=1
       BUILTINS="${BUILTINS} dvd"
       CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
@@ -4944,7 +4944,6 @@ fi
 
 
 
-
 
 
 trap '' 1 2 15
@@ -5114,7 +5113,6 @@ s%@TRACE@%$TRACE%g
 s%@PROFILING@%$PROFILING%g
 s%@OPTIMS@%$OPTIMS%g
 s%@NEED_GETOPT@%$NEED_GETOPT%g
-s%@NEED_BSDI_LIBDVD@%$NEED_BSDI_LIBDVD%g
 s%@MOC@%$MOC%g
 s%@WINDRES@%$WINDRES%g
 s%@LCFLAGS@%$LCFLAGS%g
@@ -5152,7 +5150,7 @@ s%@CFLAGS_SDL@%$CFLAGS_SDL%g
 s%@CFLAGS_X11@%$CFLAGS_X11%g
 s%@OBJ_DVD@%$OBJ_DVD%g
 s%@OBJ_LIBDVDCSS@%$OBJ_LIBDVDCSS%g
-s%@LOCAL_LIBDVDCSS@%$LOCAL_LIBDVDCSS%g
+s%@NEED_LIBDVDCSS@%$NEED_LIBDVDCSS%g
 
 CEOF
 EOF
@@ -5400,8 +5398,8 @@ echo "
 libdvdcss configuration
 -----------------------
 can be built          : ${CAN_BUILD_LIBDVDCSS}
-will be built         : ${LOCAL_LIBDVDCSS}"
-if test x${LOCAL_LIBDVDCSS} = x1
+will be built         : ${NEED_LIBDVDCSS}"
+if test x${NEED_LIBDVDCSS} = x1
 then
   echo "need BSDI libdvd      : ${NEED_BSDI_LIBDVD}"
   echo "link statically       : ${STATIC_LIBDVDCSS}"

diff --git a/configure.in b/configure.in
index 579d5c4af70b696ec316a620ea19243d350aa450..3d93dc355f0f674315b596753f95a011c8f81898 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -253,16 +253,16 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
   AC_EGREP_HEADER(dvd_struct,dvd.h,[
     AC_DEFINE(DVD_STRUCT_IN_DVD_H, 1,
               Define if <dvd.h> defines DVD_STRUCT.)
-    LINUX_DVD_STRUCT=1
-    OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
     LIB_LIBDVDCSS="${LIB_LIBDVDCSS} -ldvd"
-    CFLAGS_LIBDVDCSS="${CFLAGS_LIBDVDCSS} -I../BSDI_ioctl"
+    LINUX_DVD_STRUCT=1
   ],[
     dnl
     dnl BSDI: /sys/dev/scsi/scsi_ioctl.h, using our own libdvd
     dnl
     AC_CHECK_HEADERS(/sys/dev/scsi/scsi_ioctl.h,[
       NEED_BSDI_LIBDVD=1
+      OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
+      CFLAGS_LIBDVDCSS="${CFLAGS_LIBDVDCSS} -I../BSDI_ioctl"
       LINUX_DVD_STRUCT=1
     ])
   ])
@@ -392,7 +392,7 @@ LIB="${LIB} ${THREAD_LIB}"
 dnl
 dnl  DVD module: check for installed libdvdcss or local libdvdcss
 dnl
-LOCAL_LIBDVDCSS=0
+NEED_LIBDVDCSS=0
 STATIC_LIBDVDCSS=0
 DUMMY_LIBDVDCSS=0
 AC_ARG_WITH(dvdcss,
@@ -402,7 +402,7 @@ AC_ARG_WITH(dvdcss,
       # local libdvdcss, statically linked
       if test x${CAN_BUILD_LIBDVDCSS} = x1
       then
-        LOCAL_LIBDVDCSS=1
+        NEED_LIBDVDCSS=1
         STATIC_LIBDVDCSS=1
         BUILTINS="${BUILTINS} dvd"
         CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
@@ -414,7 +414,7 @@ AC_ARG_WITH(dvdcss,
       # local libdvdcss, dynamically linked
       if test x${CAN_BUILD_LIBDVDCSS} = x1
       then
-        LOCAL_LIBDVDCSS=1
+        NEED_LIBDVDCSS=1
         BUILTINS="${BUILTINS} dvd"
         CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
         LIB_DVD="${LIB_DVD} -Llib -ldvdcss"
@@ -446,7 +446,7 @@ AC_ARG_WITH(dvdcss,
   # if libdvdcss is in the archive, or to use the dummy replacement otherwise.
   [ if test x${CAN_BUILD_LIBDVDCSS} = x1
     then
-      LOCAL_LIBDVDCSS=1
+      NEED_LIBDVDCSS=1
       STATIC_LIBDVDCSS=1
       BUILTINS="${BUILTINS} dvd"
       CFLAGS_DVD="${CFLAGS_DVD} -I../../extras/libdvdcss"
@@ -849,7 +849,6 @@ AC_SUBST(TRACE)
 AC_SUBST(PROFILING)
 AC_SUBST(OPTIMS)
 AC_SUBST(NEED_GETOPT)
-AC_SUBST(NEED_BSDI_LIBDVD)
 AC_SUBST(MOC)
 AC_SUBST(WINDRES)
 
@@ -892,7 +891,7 @@ AC_SUBST(CFLAGS_X11)
 AC_SUBST(OBJ_DVD)
 AC_SUBST(OBJ_LIBDVDCSS)
 
-AC_SUBST(LOCAL_LIBDVDCSS)
+AC_SUBST(NEED_LIBDVDCSS)
 
 AC_OUTPUT([Makefile.opts include/config.h])
 
@@ -923,8 +922,8 @@ echo "
 libdvdcss configuration
 -----------------------
 can be built          : ${CAN_BUILD_LIBDVDCSS}
-will be built         : ${LOCAL_LIBDVDCSS}"
-if test x${LOCAL_LIBDVDCSS} = x1
+will be built         : ${NEED_LIBDVDCSS}"
+if test x${NEED_LIBDVDCSS} = x1
 then
   echo "need BSDI libdvd      : ${NEED_BSDI_LIBDVD}"
   echo "link statically       : ${STATIC_LIBDVDCSS}"

diff --git a/debian/control b/debian/control
index 55545e1856145b7e96bfd99cd411cf4dde19a5b8..70bfb71726218eca29bec71b38884076ece063e1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Description: a free MPEG and DVD player
 Package: libdvdcss0.0.3
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libdvdcss0.0.2
 Description: a portable abstraction library for DVD decryption
  libdvdcss is a portable abstraction library for DVD decryption, it
  provides a simple API to access a DVD device as a block device.
@@ -27,6 +28,7 @@ Description: a portable abstraction library for DVD decryption
 Package: libdvdcss0.0.3-dev
 Architecture: any
 Depends: libdvdcss0.0.3 (= ${Source-Version}), libc6-dev
+Conflicts: libdvdcss0.0.2-dev
 Description: development files for libdvdcss0
  libdvdcss is a portable abstraction library for DVD decryption, it
  provides a simple API to access a DVD device as a block device.

diff --git a/plugins/dvd/Makefile b/plugins/dvd/Makefile
index ca44577e07296364100acb800886f27f63dd717b..45c551f2b5f2bd383a50d49cb19687f6a78e820c 100644 (file)
--- a/plugins/dvd/Makefile
+++ b/plugins/dvd/Makefile
@@ -30,7 +30,7 @@ $(BUILTIN_DVD): BUILTIN_%.o: %.c
 # Real targets
 #
 
-ifeq (1,$(LOCAL_LIBDVDCSS))
+ifeq (1,$(NEED_LIBDVDCSS))
 ../dvd.so: libdvdcss $(PLUGIN_DVD)
        $(CC) $(PCFLAGS) -o $@ $(PLUGIN_DVD) $(PLCFLAGS) $(LIB_DVD_PLUGIN)