diff --git a/.cvsignore b/.cvsignore
index 8ba529d..67e3234 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libdvdnav-4.1.1.tar.gz
+libdvdnav-4.1.2.tar.gz
diff --git a/libdvdnav-destdir.patch b/libdvdnav-destdir.patch
deleted file mode 100644
index 7b31d30..0000000
--- a/libdvdnav-destdir.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -up libdvdnav-4.1.1/Makefile.destdir libdvdnav-4.1.1/Makefile
---- libdvdnav-4.1.1/Makefile.destdir	2007-11-21 19:18:49.000000000 +0100
-+++ libdvdnav-4.1.1/Makefile	2007-11-21 19:19:10.000000000 +0100
-@@ -115,45 +115,45 @@ endif
- # Install targets
- 
- install-headers:
--	install -d $(incdir)
--	install -m 644 $(HEADERS) $(incdir)
-+	install -d $(DESTDIR)$(incdir)
-+	install -m 644 $(HEADERS) $(DESTDIR)$(incdir)
- ifeq ($(DVDREAD),internal)
--	install -d $(dvdread_incdir)
--	install -m 644 $(DVDREAD_HEADERS) $(dvdread_incdir)
-+	install -d $(DESTDIR)$(dvdread_incdir)
-+	install -m 644 $(DVDREAD_HEADERS) $(DESTDIR)$(dvdread_incdir)
- endif
- 
- install-shared: $(SHLIB)
--	install -d $(shlibdir)
-+	install -d $(DESTDIR)$(shlibdir)
- 
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \
--		$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
-+		$(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(MINI_SHLIB) \
--		$(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION)
-+		$(DESTDIR)$(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION)
- 
--	cd $(shlibdir) && \
-+	cd $(DESTDIR)$(shlibdir) && \
- 		ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
--	cd $(shlibdir) && \
-+	cd $(DESTDIR)$(shlibdir) && \
- 		ln -sf $(MINI_SHLIB).$(SHLIB_VERSION) $(MINI_SHLIB).$(SHLIB_MAJOR)
--	cd $(shlibdir) && \
-+	cd $(DESTDIR)$(shlibdir) && \
- 		ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
--	cd $(shlibdir) && \
-+	cd $(DESTDIR)$(shlibdir) && \
- 		ln -sf $(MINI_SHLIB).$(SHLIB_MAJOR) $(MINI_SHLIB)
- 
- ifeq ($(DVDREAD),internal)
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
--		$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
--	cd $(shlibdir) && \
-+		$(DESTDIR)$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
-+	cd $(DESTDIR)$(shlibdir) && \
- 		ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
--	cd $(shlibdir) && \
-+	cd $(DESTDIR)$(shlibdir) && \
- 		ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB)
- endif
- 
- install-static: $(LIB)
--	install -d $(libdir)
-+	install -d $(DESTDIR)$(libdir)
- 
--	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(libdir)/$(LIB)
-+	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(DESTDIR)$(libdir)/$(LIB)
- ifeq ($(DVDREAD),internal)
--	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(libdir)/$(DVDREAD_LIB)
-+	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(DESTDIR)$(libdir)/$(DVDREAD_LIB)
- endif
- 
- 
-@@ -178,8 +178,8 @@ dvdnav-config: $(.OBJDIR)
- 	chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config
- 
- install-dvdnav-config: dvdnav-config
--	install -d $(PREFIX)/bin
--	install -m 0755 $(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 0755 $(.OBJDIR)/dvdnav-config $(DESTDIR)$(PREFIX)/bin/dvdnav-config
- 
- 
- vpath %.so ${.OBJDIR}
-diff -up libdvdnav-4.1.1/configure2.destdir libdvdnav-4.1.1/configure2
---- libdvdnav-4.1.1/configure2.destdir	2007-11-21 19:18:49.000000000 +0100
-+++ libdvdnav-4.1.1/configure2	2007-11-21 19:18:49.000000000 +0100
-@@ -127,11 +127,11 @@ esac
- cat > config.mak << EOF 
- # Automatically generated by configure, do not edit
- DESTDIR =
--PREFIX=\$(DESTDIR)$PREFIX
--libdir=\$(DESTDIR)$libdir
--shlibdir=\$(DESTDIR)$shlibdir
--incdir=\$(DESTDIR)$incdir
--dvdread_incdir=\$(DESTDIR)$dvdread_incdir
-+PREFIX=$PREFIX
-+libdir=$libdir
-+shlibdir=$shlibdir
-+incdir=$incdir
-+dvdread_incdir=$dvdread_incdir
- THREADLIB=$threadlib
- BUILD_SHARED=$SHARED
- BUILD_STATIC=$STATIC
diff --git a/libdvdnav-external-dvdread.patch b/libdvdnav-external-dvdread.patch
deleted file mode 100644
index b7fd85e..0000000
--- a/libdvdnav-external-dvdread.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up libdvdnav-4.1.1/Makefile.dvdread libdvdnav-4.1.1/Makefile
---- libdvdnav-4.1.1/Makefile.dvdread	2007-11-22 20:02:30.000000000 +0100
-+++ libdvdnav-4.1.1/Makefile	2007-11-22 20:03:06.000000000 +0100
-@@ -21,10 +21,12 @@ CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src 
- CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H
- 
--ifeq ($(DVDREAD),internal)
- L=libdvdnav
- MINI_L=libdvdnavmini
-+ifeq ($(DVDREAD),internal)
- DVDREAD_L=libdvdread
-+DVDREAD_LIB = $(DVDREAD_L).a
-+DVDREAD_SHLIB = $(DVDREAD_L).so
- VPATH+= $(SRC_PATH_BARE)/src/dvdread
- DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
- 	src/dvdread/ifo_print.h \
-@@ -38,15 +40,12 @@ DVDREAD_SRCS = dvd_input.c dvd_reader.c 
- 	md5.c nav_print.c nav_read.c
- CFLAGS += -I$(SRC_PATH)/src/dvdread
- else
--L=libdvdnavmini
- CFLAGS += -I$(DVDREAD_DIR)
- endif
- 
- LIB = $(L).a
--DVDREAD_LIB = $(DVDREAD_L).a
- SHLIB = $(L).so
- MINI_SHLIB = $(MINI_L).so
--DVDREAD_SHLIB = $(DVDREAD_L).so
- 
- .OBJDIR=        obj
- DEPFLAG = -M
-@@ -91,16 +90,25 @@ $(.OBJDIR):
- ${LIB}: version.h $(.OBJDIR) $(OBJS) $(BUILDDEPS)
- 	cd $(.OBJDIR) && $(AR) rc $@ $(OBJS)
- 	cd $(.OBJDIR) && $(RANLIB) $@
-+ifeq ($(DVDREAD),internal)
- ${DVDREAD_LIB}: version.h $(.OBJDIR) $(DVDREAD_OBJS) $(BUILDDEPS)
- 	cd $(.OBJDIR) && $(AR) rc $@ $(DVDREAD_OBJS)
- 	cd $(.OBJDIR) && $(RANLIB) $@
-+endif
- 
-+ifeq ($(DVDREAD),internal)
-+${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS) $(DVDREAD_SHLIB)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -L. -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
-+else
- ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
- 	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
-+endif
- ${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
- 	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(MINI_SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(THREADLIB)
-+ifeq ($(DVDREAD),internal)
- ${DVDREAD_SHLIB}: version.h $(.OBJDIR) $(DVDREAD_SHOBJS) $(BUILDDEPS)
- 	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -ldl -Wl,-soname=$(DVDREAD_SHLIB).$(SHLIB_MAJOR) -o $@ $(DVDREAD_SHOBJS)
-+endif
- 
- .c.so:	$(BUILDDEPS)
- 	cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $<
-@@ -114,8 +122,10 @@ ${DVDREAD_SHLIB}: version.h $(.OBJDIR) $
- install-headers:
- 	install -d $(incdir)
- 	install -m 644 $(HEADERS) $(incdir)
-+ifeq ($(DVDREAD),internal)
- 	install -d $(dvdread_incdir)
- 	install -m 644 $(DVDREAD_HEADERS) $(dvdread_incdir)
-+endif
- 
- install-shared: $(SHLIB)
- 	install -d $(shlibdir)
-@@ -124,27 +134,32 @@ install-shared: $(SHLIB)
- 		$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(MINI_SHLIB) \
- 		$(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION)
--	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
--		$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
- 
- 	cd $(shlibdir) && \
- 		ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
- 	cd $(shlibdir) && \
- 		ln -sf $(MINI_SHLIB).$(SHLIB_VERSION) $(MINI_SHLIB).$(SHLIB_MAJOR)
- 	cd $(shlibdir) && \
--		ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
--	cd $(shlibdir) && \
- 		ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
- 	cd $(shlibdir) && \
- 		ln -sf $(MINI_SHLIB).$(SHLIB_MAJOR) $(MINI_SHLIB)
-+
-+ifeq ($(DVDREAD),internal)
-+	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
-+		$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
-+	cd $(shlibdir) && \
-+		ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
- 	cd $(shlibdir) && \
- 		ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB)
-+endif
- 
- install-static: $(LIB)
- 	install -d $(libdir)
- 
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(libdir)/$(LIB)
-+ifeq ($(DVDREAD),internal)
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(libdir)/$(DVDREAD_LIB)
-+endif
- 
- 
- # Clean targets
diff --git a/libdvdnav-inttypes.patch b/libdvdnav-inttypes.patch
deleted file mode 100644
index 0cfae15..0000000
--- a/libdvdnav-inttypes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libdvdnav-4.1.1/src/dvd_types.h.int libdvdnav-4.1.1/src/dvd_types.h
---- libdvdnav-4.1.1/src/dvd_types.h.int	2007-04-21 13:08:56.000000000 +0200
-+++ libdvdnav-4.1.1/src/dvd_types.h	2008-01-27 22:06:32.000000000 +0100
-@@ -29,6 +29,8 @@
- #ifndef DVD_H_INCLUDED
- #define DVD_H_INCLUDED
- 
-+#include <inttypes.h>
-+
- /*
-  * DVD Menu ID
-  * (see dvdnav_menu_call())
diff --git a/libdvdnav-libdir.patch b/libdvdnav-libdir.patch
deleted file mode 100644
index feb8de3..0000000
--- a/libdvdnav-libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: misc/dvdnav-config2.sh
-===================================================================
---- misc/dvdnav-config2.sh	(revision 966)
-+++ misc/dvdnav-config2.sh	(working copy)
-@@ -73,9 +73,9 @@
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$prefix/lib -ldvdnav $dvdreadlib $threadlib
-+      echo -L$libdir -ldvdnav $dvdreadlib $threadlib
- fi      
- 
- if test "$echo_minilibs" = "yes"; then
--      echo -L$prefix/lib -ldvdnavmini $threadlib
-+      echo -L$libdir -ldvdnavmini $threadlib
- fi
-Index: Makefile
-===================================================================
---- Makefile	(revision 966)
-+++ Makefile	(working copy)
-@@ -159,6 +159,7 @@
- 
- dvdnav-config: $(.OBJDIR)
- 	echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config
-+	echo -e 'libdir='$(shlibdir)'\n' >> $(.OBJDIR)/dvdnav-config
- 	echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config
- 	echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config
- 	echo -e 'dvdreaddir='$(DVDREAD_DIR)'\n' >> $(.OBJDIR)/dvdnav-config
diff --git a/libdvdnav-soname.patch b/libdvdnav-soname.patch
deleted file mode 100644
index b910935..0000000
--- a/libdvdnav-soname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile	(revision 966)
-+++ Makefile	(working copy)
-@@ -96,11 +96,11 @@
- 	cd $(.OBJDIR) && $(RANLIB) $@
- 
- ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
--	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
- ${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
--	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -o $@ $(SHOBJS) $(THREADLIB)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(MINI_SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(THREADLIB)
- ${DVDREAD_SHLIB}: version.h $(.OBJDIR) $(DVDREAD_SHOBJS) $(BUILDDEPS)
--	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -ldl -o $@ $(DVDREAD_SHOBJS)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -ldl -Wl,-soname=$(DVDREAD_SHLIB).$(SHLIB_MAJOR) -o $@ $(DVDREAD_SHOBJS)
- 
- .c.so:	$(BUILDDEPS)
- 	cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $<
diff --git a/libdvdnav-svn.patch b/libdvdnav-svn.patch
deleted file mode 100644
index 9d10728..0000000
--- a/libdvdnav-svn.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Index: src/dvdread/ifo_print.h
-===================================================================
---- src/dvdread/ifo_print.h	(revision 956)
-+++ src/dvdread/ifo_print.h	(revision 966)
-@@ -24,7 +24,7 @@
- #ifdef DVDNAV_COMPILE
- #  include "ifo_types.h"
- #else
--#  include <dvdnav/ifo_types.h> /*  Only for vm_cmd_t  */
-+#  include <dvdread/ifo_types.h> /*  Only for vm_cmd_t  */
- #endif
- 
- void ifo_print(dvd_reader_t *dvd, int title);
-Index: src/dvdread/Makefile.am
-===================================================================
---- src/dvdread/Makefile.am	(revision 956)
-+++ src/dvdread/Makefile.am	(revision 966)
-@@ -13,7 +13,7 @@
- libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS)
- 
- libdvdread_la_LDFLAGS = -version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
--	-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*)"
-+	-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
- 
- include_HEADERS = dvd_reader.h nav_read.h ifo_read.h \
--	nav_print.h ifo_print.h ifo_types.h nav_types.h
-+	nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h
-Index: misc/dvdnav-config2.sh
-===================================================================
---- misc/dvdnav-config2.sh	(revision 956)
-+++ misc/dvdnav-config2.sh	(revision 966)
-@@ -1,6 +1,7 @@
-+dvdreadlib="-ldvdread"
-+dvdreadmsg="[--minilibs]"
- if test "$dvdread" = "external"; then
--    dvdreadlib="-ldvdread"
--    dvdreadmsg="[--minilibs --minicflags]"
-+    dvdreadmsg="[--minicflags]"
-     dvdreadcflags="-I$dvdreaddir"
-     extracflags="-DDVDNAV_USES_EXTERNAL_DVDREAD"
- fi
-@@ -50,11 +51,7 @@
-       echo_libs=yes
-       ;;
-     --minilibs)
--      if test "$dvdread" = "external"; then
-           echo_minilibs=yes
--      else
--          usage 1 1>&2
--      fi
-       ;;
-     *)
-       usage 1 1>&2
-Index: configure2
-===================================================================
---- configure2	(revision 956)
-+++ configure2	(revision 966)
-@@ -102,7 +102,7 @@
- 
- test -z $libdir && libdir=$PREFIX/lib
- test -z $shlibdir && shlibdir=$PREFIX/lib
--test -z $incdir && incdir=$PREFIX/include/dvdnav
-+test -z $incdir && incdir=$PREFIX/include/dvdnav && dvdread_incdir=$PREFIX/include/dvdread
- 
- if [ "$DVDREAD" != "internal" ] ; then
-   if [ -d "$DVDREAD" -a -f "$DVDREAD/dvd_reader.h" ] ; then
-@@ -131,6 +131,7 @@
- libdir=\$(DESTDIR)$libdir
- shlibdir=\$(DESTDIR)$shlibdir
- incdir=\$(DESTDIR)$incdir
-+dvdread_incdir=\$(DESTDIR)$dvdread_incdir
- THREADLIB=$threadlib
- BUILD_SHARED=$SHARED
- BUILD_STATIC=$STATIC
-Index: Makefile
-===================================================================
---- Makefile	(revision 956)
-+++ Makefile	(revision 966)
-@@ -23,15 +23,18 @@
- 
- ifeq ($(DVDREAD),internal)
- L=libdvdnav
-+MINI_L=libdvdnavmini
-+DVDREAD_L=libdvdread
- VPATH+= $(SRC_PATH_BARE)/src/dvdread
--HEADERS += src/dvdread/dvd_reader.h \
-+DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
- 	src/dvdread/ifo_print.h \
- 	src/dvdread/ifo_read.h \
- 	src/dvdread/ifo_types.h \
- 	src/dvdread/nav_print.h \
- 	src/dvdread/nav_read.h \
-+	src/dvdread/dvd_udf.h \
- 	src/dvdread/nav_types.h
--SRCS+= dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
-+DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
- 	md5.c nav_print.c nav_read.c
- CFLAGS += -I$(SRC_PATH)/src/dvdread
- else
-@@ -40,25 +43,31 @@
- endif
- 
- LIB = $(L).a
-+DVDREAD_LIB = $(DVDREAD_L).a
- SHLIB = $(L).so
-+MINI_SHLIB = $(MINI_L).so
-+DVDREAD_SHLIB = $(DVDREAD_L).so
- 
- .OBJDIR=        obj
- DEPFLAG = -M
- 
- OBJS = $(patsubst %.c,%.o, $(SRCS))
-+DVDREAD_OBJS = $(patsubst %.c,%.o, $(DVDREAD_SRCS))
- SHOBJS = $(patsubst %.c,%.so, $(SRCS))
-+DVDREAD_SHOBJS = $(patsubst %.c,%.so, $(DVDREAD_SRCS))
- DEPS= ${OBJS:%.o=%.d}
-+DVDREAD_DEPS= ${DVDREAD_OBJS:%.o=%.d}
- 
- BUILDDEPS = Makefile config.mak
- 
- ifeq ($(BUILD_SHARED),yes)
--all:	$(SHLIB) dvdnav-config
--install: $(SHLIB) install-shared install-dvdnav-config
-+all:	$(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config
-+install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config
- endif
- 
- ifeq ($(BUILD_STATIC),yes)
--all:	$(LIB) dvdnav-config
--install: $(LIB) install-static install-dvdnav-config
-+all:	$(LIB) $(DVDREAD_LIB) dvdnav-config
-+install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config
- endif
- 
- install: install-headers
-@@ -82,9 +91,16 @@
- ${LIB}: version.h $(.OBJDIR) $(OBJS) $(BUILDDEPS)
- 	cd $(.OBJDIR) && $(AR) rc $@ $(OBJS)
- 	cd $(.OBJDIR) && $(RANLIB) $@
-+${DVDREAD_LIB}: version.h $(.OBJDIR) $(DVDREAD_OBJS) $(BUILDDEPS)
-+	cd $(.OBJDIR) && $(AR) rc $@ $(DVDREAD_OBJS)
-+	cd $(.OBJDIR) && $(RANLIB) $@
- 
- ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
--	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(THREADLIB) -o $@ $(SHOBJS)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
-+${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -o $@ $(SHOBJS) $(THREADLIB)
-+${DVDREAD_SHLIB}: version.h $(.OBJDIR) $(DVDREAD_SHOBJS) $(BUILDDEPS)
-+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -ldl -o $@ $(DVDREAD_SHOBJS)
- 
- .c.so:	$(BUILDDEPS)
- 	cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $<
-@@ -98,22 +114,37 @@
- install-headers:
- 	install -d $(incdir)
- 	install -m 644 $(HEADERS) $(incdir)
-+	install -d $(dvdread_incdir)
-+	install -m 644 $(DVDREAD_HEADERS) $(dvdread_incdir)
- 
- install-shared: $(SHLIB)
- 	install -d $(shlibdir)
- 
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \
- 		$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
-+	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(MINI_SHLIB) \
-+		$(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION)
-+	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
-+		$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
- 
- 	cd $(shlibdir) && \
- 		ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
- 	cd $(shlibdir) && \
-+		ln -sf $(MINI_SHLIB).$(SHLIB_VERSION) $(MINI_SHLIB).$(SHLIB_MAJOR)
-+	cd $(shlibdir) && \
-+		ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
-+	cd $(shlibdir) && \
- 		ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
-+	cd $(shlibdir) && \
-+		ln -sf $(MINI_SHLIB).$(SHLIB_MAJOR) $(MINI_SHLIB)
-+	cd $(shlibdir) && \
-+		ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB)
- 
- install-static: $(LIB)
- 	install -d $(libdir)
- 
- 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(libdir)/$(LIB)
-+	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(libdir)/$(DVDREAD_LIB)
- 
- 
- # Clean targets
diff --git a/libdvdnav-version.patch b/libdvdnav-version.patch
deleted file mode 100644
index cee97f0..0000000
--- a/libdvdnav-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up libdvdnav-4.1.1/version.sh.r libdvdnav-4.1.1/version.sh
---- libdvdnav-4.1.1/version.sh.r	2007-04-15 23:58:42.000000000 +0200
-+++ libdvdnav-4.1.1/version.sh	2007-11-21 17:46:55.000000000 +0100
-@@ -1,11 +1,6 @@
- #!/bin/sh
- 
--svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
--test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries | \
--                                    cut -d '"' -f2 2> /dev/null`
--test $svn_revision || svn_revision=UNKNOWN
--
--NEW_REVISION="#define VERSION \"SVN-r$svn_revision\""
-+NEW_REVISION="#define VERSION \"4.1.1\""
- OLD_REVISION=`cat version.h 2> /dev/null`
- 
- # Update version.h only on revision changes to avoid spurious rebuilds
diff --git a/libdvdnav.spec b/libdvdnav.spec
index 67fb39e..ba81f28 100644
--- a/libdvdnav.spec
+++ b/libdvdnav.spec
@@ -1,18 +1,11 @@
 Name:           libdvdnav
-Version:        4.1.1
-Release:        6%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        A library for reading DVD video discs based on Ogle code
 
 Group:          System Environment/Libraries
 License:        GPLv2+
-Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.1.tar.gz
-Patch1:         %{name}-svn.patch
-Patch2:         %{name}-version.patch
-Patch3:         %{name}-libdir.patch
-Patch4:         %{name}-soname.patch
-Patch5:         %{name}-external-dvdread.patch
-Patch6:         %{name}-destdir.patch
-Patch7:         %{name}-inttypes.patch
+Source:         http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -52,13 +45,6 @@ This package contains development files for libdvdread.
 
 %prep
 %setup -q
-%patch1 -p0
-%patch2 -p1
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1 -b .dvdread
-%patch6 -p1 -b .destdir
-%patch7 -p1 -b .int
 
 %build
 ./configure2 \
@@ -119,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdvdread.so
 
 %changelog
+* Sun Apr 13 2008 Dominik Mierzejewski <rpm[AT]greysector.net> 4.1.2-1
+- update to 4.1.2
+- drop obsolete patches (merged upstream)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.1.1-6
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 144212d..aff4441 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91ff52cade291e79060f87fd431fa1ab  libdvdnav-4.1.1.tar.gz
+0e9a494403f9f5a2e781252c77599561  libdvdnav-4.1.2.tar.gz