Version bump, bug 231800; thanks to Olivier Rolland for ebuild

(Portage version: 2.2_rc3/cvs/Linux 2.6.25-tuxonice-r6 x86_64)

1 files changed, 595 insertions, 0 deletions

diff --git a/media-video/ogmrip/files/ogmrip-0.12.1-as-needed.patch b/media-video/ogmrip/files/ogmrip-0.12.1-as-needed.patch
new file mode 100644
index 000000000000..b1cfbfa90e3f
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.12.1-as-needed.patch
@@ -0,0 +1,595 @@
+diff -Naur ogmrip-0.12.1.orig/libogmdvd/Makefile.am ogmrip-0.12.1/libogmdvd/Makefile.am
+--- ogmrip-0.12.1.orig/libogmdvd/Makefile.am	2008-06-09 21:01:20.000000000 +0200
++++ ogmrip-0.12.1/libogmdvd/Makefile.am	2008-07-15 21:00:11.000000000 +0200
+@@ -27,8 +27,10 @@
+   ogmdvd.h
+ 
+ libogmdvd_la_LDFLAGS = \
+-  -version-info $(OGMDVD_LT_VERSION) \
+-  $(DVDREAD_LIBS)
++  -version-info $(OGMDVD_LT_VERSION)
++
++libogmdvd_la_LIBADD = \
++  $(OGMRIP_LIBS) $(DVDREAD_LIBS)
+ 
+ libogmdvd_ladir = \
+   $(includedir)/ogmdvd
+diff -Naur ogmrip-0.12.1.orig/libogmdvd/Makefile.in ogmrip-0.12.1/libogmdvd/Makefile.in
+--- ogmrip-0.12.1.orig/libogmdvd/Makefile.in	2008-07-14 21:14:24.000000000 +0200
++++ ogmrip-0.12.1/libogmdvd/Makefile.in	2008-07-15 20:57:43.000000000 +0200
+@@ -57,7 +57,9 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libogmdvd_ladir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libogmdvd_la_LIBADD =
++am__DEPENDENCIES_1 =
++libogmdvd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ am_libogmdvd_la_OBJECTS = ogmdvd-audio.lo ogmdvd-contrib.lo \
+ 	ogmdvd-disc.lo ogmdvd-labels.lo ogmdvd-parser.lo \
+ 	ogmdvd-priv.lo ogmdvd-reader.lo ogmdvd-stream.lo \
+@@ -340,8 +342,10 @@
+   ogmdvd.h
+ 
+ libogmdvd_la_LDFLAGS = \
+-  -version-info $(OGMDVD_LT_VERSION) \
+-  $(DVDREAD_LIBS)
++  -version-info $(OGMDVD_LT_VERSION)
++
++libogmdvd_la_LIBADD = \
++  $(OGMRIP_LIBS) $(DVDREAD_LIBS)
+ 
+ libogmdvd_ladir = \
+   $(includedir)/ogmdvd
+diff -Naur ogmrip-0.12.1.orig/libogmjob/Makefile.am ogmrip-0.12.1/libogmjob/Makefile.am
+--- ogmrip-0.12.1.orig/libogmjob/Makefile.am	2008-06-09 21:01:17.000000000 +0200
++++ ogmrip-0.12.1/libogmjob/Makefile.am	2008-07-15 21:00:28.000000000 +0200
+@@ -34,6 +34,9 @@
+ libogmjob_la_LDFLAGS = \
+   -version-info $(OGMJOB_LT_VERSION)
+ 
++libogmjob_la_LIBADD =\
++  $(OGMRIP_LIBS)
++
+ ogmjob-marshal.h: ogmjob-marshal.list $(GLIB_GENMARSHAL)
+ 	$(GLIB_GENMARSHAL) $< --header --prefix=ogmjob_cclosure_marshal > $@
+ 
+diff -Naur ogmrip-0.12.1.orig/libogmjob/Makefile.in ogmrip-0.12.1/libogmjob/Makefile.in
+--- ogmrip-0.12.1.orig/libogmjob/Makefile.in	2008-07-14 21:14:24.000000000 +0200
++++ ogmrip-0.12.1/libogmjob/Makefile.in	2008-07-15 20:59:38.000000000 +0200
+@@ -57,7 +57,8 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libogmjob_ladir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libogmjob_la_LIBADD =
++am__DEPENDENCIES_1 =
++libogmjob_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libogmjob_la_OBJECTS = ogmjob-bin.lo ogmjob-container.lo \
+ 	ogmjob-exec.lo ogmjob-list.lo ogmjob-log.lo ogmjob-marshal.lo \
+ 	ogmjob-pipeline.lo ogmjob-queue.lo ogmjob-spawn.lo
+@@ -346,6 +347,9 @@
+ libogmjob_la_LDFLAGS = \
+   -version-info $(OGMJOB_LT_VERSION)
+ 
++libogmjob_la_LIBADD = \
++  $(OGMRIP_LIBS)
++
+ @MAINTAINER_MODE_TRUE@DEBUG_CFLAGS = \
+ @MAINTAINER_MODE_TRUE@  -DG_ENABLE_DEBUG
+ 
+diff -Naur ogmrip-0.12.1.orig/libogmrip/Makefile.am ogmrip-0.12.1/libogmrip/Makefile.am
+--- ogmrip-0.12.1.orig/libogmrip/Makefile.am	2008-06-09 21:00:20.000000000 +0200
++++ ogmrip-0.12.1/libogmrip/Makefile.am	2008-07-15 21:00:21.000000000 +0200
+@@ -41,7 +41,8 @@
+ 
+ libogmrip_la_LIBADD = \
+   $(top_builddir)/libogmdvd/libogmdvd.la \
+-  $(top_builddir)/libogmjob/libogmjob.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  $(OGMRIP_LIBS)
+ 
+ #
+ # Common
+@@ -57,7 +58,7 @@
+ libogmrip_mplayer_la_LIBADD = \
+   $(top_builddir)/libogmdvd/libogmdvd.la \
+   $(top_builddir)/libogmjob/libogmjob.la \
+-  libogmrip.la
++  libogmrip.la $(OGMRIP_LIBS)
+ 
+ libogmrip_mplayer_ladir = \
+   $(includedir)/ogmrip
+@@ -75,7 +76,8 @@
+ libogmrip_lavc_la_LIBADD = \
+   $(top_builddir)/libogmdvd/libogmdvd.la \
+   $(top_builddir)/libogmjob/libogmjob.la \
+-  libogmrip.la libogmrip-mplayer.la
++  libogmrip.la libogmrip-mplayer.la \
++  $(OGMRIP_LIBS)
+ 
+ libogmrip_lavc_ladir = \
+   $(includedir)/ogmrip
+@@ -136,8 +138,8 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_theora_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la libogmrip-mplayer.la
+ endif
+ 
+ if HAVE_X264_SUPPORT
+@@ -153,7 +155,7 @@
+ 
+ libogmrip_x264_la_LIBADD = \
+   libogmrip.la \
+-  libogmrip-mplayer.la
++  libogmrip-mplayer.la -lm
+ endif
+ 
+ #
+@@ -200,8 +202,8 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_mp3_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la libogmrip-mplayer.la
+ endif
+ 
+ if HAVE_VORBIS_SUPPORT
+@@ -216,8 +218,8 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_vorbis_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la libogmrip-mplayer.la
+ endif
+ 
+ if HAVE_AAC_SUPPORT
+@@ -232,8 +234,8 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_aac_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la libogmrip-mplayer.la
+ endif
+ 
+ #
+@@ -253,8 +255,9 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_vobsub_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la libogmrip-mplayer.la \
++  $(OGMRIP_LIBS)
+ 
+ if HAVE_SRT_SUPPORT
+ subp_codecs_LTLIBRARIES += \
+@@ -268,8 +271,9 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_srt_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmdvd/libogmdvd.la \
++  libogmrip.la libogmrip-mplayer.la \
++  $(OGMRIP_LIBS)
+ endif
+ 
+ #
+@@ -304,7 +308,9 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_ogg_la_LIBADD = \
+-  libogmrip.la
++  $(top_builddir)/libogmdvd/libogmdvd.la \
++  libogmrip.la \
++  $(OGMRIP_LIBS)
+ endif
+ 
+ if HAVE_MKV_SUPPORT
+@@ -319,7 +325,10 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_mkv_la_LIBADD = \
+-  libogmrip.la
++  $(top_builddir)/libogmdvd/libogmdvd.la \
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la \
++  $(OGMRIP_LIBS)
+ endif
+ 
+ if HAVE_MP4_SUPPORT
+@@ -334,8 +343,9 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_mp4_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmdvd/libogmdvd.la \
++  libogmrip.la libogmrip-mplayer.la \
++  $(OGMRIP_LIBS)
+ endif
+ 
+ if HAVE_LAVF_SUPPORT
+diff -Naur ogmrip-0.12.1.orig/libogmrip/Makefile.in ogmrip-0.12.1/libogmrip/Makefile.in
+--- ogmrip-0.12.1.orig/libogmrip/Makefile.in	2008-07-14 21:14:25.000000000 +0200
++++ ogmrip-0.12.1/libogmrip/Makefile.in	2008-07-15 20:58:41.000000000 +0200
+@@ -106,8 +106,9 @@
+ LTLIBRARIES = $(audio_codecs_LTLIBRARIES) $(containers_LTLIBRARIES) \
+ 	$(lib_LTLIBRARIES) $(subp_codecs_LTLIBRARIES) \
+ 	$(video_codecs_LTLIBRARIES)
+-@HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_DEPENDENCIES = libogmrip.la \
+-@HAVE_AAC_SUPPORT_TRUE@	libogmrip-mplayer.la
++@HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_DEPENDENCIES =  \
++@HAVE_AAC_SUPPORT_TRUE@	$(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_AAC_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
+ am__libogmrip_aac_la_SOURCES_DIST = ogmrip-aac.c
+ @HAVE_AAC_SUPPORT_TRUE@am_libogmrip_aac_la_OBJECTS = ogmrip-aac.lo
+ libogmrip_aac_la_OBJECTS = $(am_libogmrip_aac_la_OBJECTS)
+@@ -129,13 +130,17 @@
+ 	$(am_libogmrip_lavc_mpeg4_la_OBJECTS)
+ @HAVE_LAVC_SUPPORT_TRUE@am_libogmrip_lavc_mpeg4_la_rpath = -rpath \
+ @HAVE_LAVC_SUPPORT_TRUE@	$(video_codecsdir)
++am__DEPENDENCIES_1 =
+ libogmrip_lavc_la_DEPENDENCIES =  \
+ 	$(top_builddir)/libogmdvd/libogmdvd.la \
+ 	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la \
+-	libogmrip-mplayer.la
++	libogmrip-mplayer.la $(am__DEPENDENCIES_1)
+ am_libogmrip_lavc_la_OBJECTS = ogmrip-lavc.lo
+ libogmrip_lavc_la_OBJECTS = $(am_libogmrip_lavc_la_OBJECTS)
+-@HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_DEPENDENCIES = libogmrip.la
++@HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_DEPENDENCIES =  \
++@HAVE_MKV_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_MKV_SUPPORT_TRUE@	$(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_MKV_SUPPORT_TRUE@	libogmrip.la $(am__DEPENDENCIES_1)
+ am__libogmrip_mkv_la_SOURCES_DIST = ogmrip-mkv.c
+ @HAVE_MKV_SUPPORT_TRUE@am_libogmrip_mkv_la_OBJECTS = ogmrip-mkv.lo
+ libogmrip_mkv_la_OBJECTS = $(am_libogmrip_mkv_la_OBJECTS)
+@@ -148,15 +153,18 @@
+ libogmrip_mov_la_OBJECTS = $(am_libogmrip_mov_la_OBJECTS)
+ @HAVE_LAVF_SUPPORT_TRUE@am_libogmrip_mov_la_rpath = -rpath \
+ @HAVE_LAVF_SUPPORT_TRUE@	$(containersdir)
+-@HAVE_MP3_SUPPORT_TRUE@libogmrip_mp3_la_DEPENDENCIES = libogmrip.la \
+-@HAVE_MP3_SUPPORT_TRUE@	libogmrip-mplayer.la
++@HAVE_MP3_SUPPORT_TRUE@libogmrip_mp3_la_DEPENDENCIES =  \
++@HAVE_MP3_SUPPORT_TRUE@	$(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_MP3_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
+ am__libogmrip_mp3_la_SOURCES_DIST = ogmrip-mp3.c
+ @HAVE_MP3_SUPPORT_TRUE@am_libogmrip_mp3_la_OBJECTS = ogmrip-mp3.lo
+ libogmrip_mp3_la_OBJECTS = $(am_libogmrip_mp3_la_OBJECTS)
+ @HAVE_MP3_SUPPORT_TRUE@am_libogmrip_mp3_la_rpath = -rpath \
+ @HAVE_MP3_SUPPORT_TRUE@	$(audio_codecsdir)
+-@HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_DEPENDENCIES = libogmrip.la \
+-@HAVE_MP4_SUPPORT_TRUE@	libogmrip-mplayer.la
++@HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_DEPENDENCIES =  \
++@HAVE_MP4_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_MP4_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la \
++@HAVE_MP4_SUPPORT_TRUE@	$(am__DEPENDENCIES_1)
+ am__libogmrip_mp4_la_SOURCES_DIST = ogmrip-mp4.c
+ @HAVE_MP4_SUPPORT_TRUE@am_libogmrip_mp4_la_OBJECTS = ogmrip-mp4.lo
+ libogmrip_mp4_la_OBJECTS = $(am_libogmrip_mp4_la_OBJECTS)
+@@ -164,23 +172,28 @@
+ @HAVE_MP4_SUPPORT_TRUE@	$(containersdir)
+ libogmrip_mplayer_la_DEPENDENCIES =  \
+ 	$(top_builddir)/libogmdvd/libogmdvd.la \
+-	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la
++	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la \
++	$(am__DEPENDENCIES_1)
+ am_libogmrip_mplayer_la_OBJECTS = ogmrip-mplayer.lo
+ libogmrip_mplayer_la_OBJECTS = $(am_libogmrip_mplayer_la_OBJECTS)
+-@HAVE_OGM_SUPPORT_TRUE@libogmrip_ogg_la_DEPENDENCIES = libogmrip.la
++@HAVE_OGM_SUPPORT_TRUE@libogmrip_ogg_la_DEPENDENCIES =  \
++@HAVE_OGM_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_OGM_SUPPORT_TRUE@	libogmrip.la $(am__DEPENDENCIES_1)
+ am__libogmrip_ogg_la_SOURCES_DIST = ogmrip-ogg.c
+ @HAVE_OGM_SUPPORT_TRUE@am_libogmrip_ogg_la_OBJECTS = ogmrip-ogg.lo
+ libogmrip_ogg_la_OBJECTS = $(am_libogmrip_ogg_la_OBJECTS)
+ @HAVE_OGM_SUPPORT_TRUE@am_libogmrip_ogg_la_rpath = -rpath \
+ @HAVE_OGM_SUPPORT_TRUE@	$(containersdir)
+-@HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_DEPENDENCIES = libogmrip.la \
+-@HAVE_SRT_SUPPORT_TRUE@	libogmrip-mplayer.la
++@HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_DEPENDENCIES =  \
++@HAVE_SRT_SUPPORT_TRUE@	$(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_SRT_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la \
++@HAVE_SRT_SUPPORT_TRUE@	$(am__DEPENDENCIES_1)
+ am__libogmrip_srt_la_SOURCES_DIST = ogmrip-srt.c
+ @HAVE_SRT_SUPPORT_TRUE@am_libogmrip_srt_la_OBJECTS = ogmrip-srt.lo
+ libogmrip_srt_la_OBJECTS = $(am_libogmrip_srt_la_OBJECTS)
+ @HAVE_SRT_SUPPORT_TRUE@am_libogmrip_srt_la_rpath = -rpath \
+ @HAVE_SRT_SUPPORT_TRUE@	$(subp_codecsdir)
+-@HAVE_THEORA_SUPPORT_TRUE@libogmrip_theora_la_DEPENDENCIES =  \
++@HAVE_THEORA_SUPPORT_TRUE@libogmrip_theora_la_DEPENDENCIES = $(top_builddir)/libogmjob/libogmjob.la \
+ @HAVE_THEORA_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
+ am__libogmrip_theora_la_SOURCES_DIST = ogmrip-theora.c
+ @HAVE_THEORA_SUPPORT_TRUE@am_libogmrip_theora_la_OBJECTS =  \
+@@ -188,10 +201,12 @@
+ libogmrip_theora_la_OBJECTS = $(am_libogmrip_theora_la_OBJECTS)
+ @HAVE_THEORA_SUPPORT_TRUE@am_libogmrip_theora_la_rpath = -rpath \
+ @HAVE_THEORA_SUPPORT_TRUE@	$(video_codecsdir)
+-libogmrip_vobsub_la_DEPENDENCIES = libogmrip.la libogmrip-mplayer.la
++libogmrip_vobsub_la_DEPENDENCIES =  \
++	$(top_builddir)/libogmjob/libogmjob.la libogmrip.la \
++	libogmrip-mplayer.la $(am__DEPENDENCIES_1)
+ am_libogmrip_vobsub_la_OBJECTS = ogmrip-vobsub.lo
+ libogmrip_vobsub_la_OBJECTS = $(am_libogmrip_vobsub_la_OBJECTS)
+-@HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_DEPENDENCIES =  \
++@HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_DEPENDENCIES = $(top_builddir)/libogmjob/libogmjob.la \
+ @HAVE_VORBIS_SUPPORT_TRUE@	libogmrip.la libogmrip-mplayer.la
+ am__libogmrip_vorbis_la_SOURCES_DIST = ogmrip-vorbis.c
+ @HAVE_VORBIS_SUPPORT_TRUE@am_libogmrip_vorbis_la_OBJECTS =  \
+@@ -217,7 +232,7 @@
+ @HAVE_XVID_SUPPORT_TRUE@am_libogmrip_xvid_la_rpath = -rpath \
+ @HAVE_XVID_SUPPORT_TRUE@	$(video_codecsdir)
+ libogmrip_la_DEPENDENCIES = $(top_builddir)/libogmdvd/libogmdvd.la \
+-	$(top_builddir)/libogmjob/libogmjob.la
++	$(top_builddir)/libogmjob/libogmjob.la $(am__DEPENDENCIES_1)
+ am_libogmrip_la_OBJECTS = ogmrip-audio-codec.lo ogmrip-chapters.lo \
+ 	ogmrip-codec.lo ogmrip-container.lo ogmrip-dvdcpy.lo \
+ 	ogmrip-edl.lo ogmrip-file.lo ogmrip-fs.lo ogmrip-plugin.lo \
+@@ -544,7 +559,8 @@
+ 
+ libogmrip_la_LIBADD = \
+   $(top_builddir)/libogmdvd/libogmdvd.la \
+-  $(top_builddir)/libogmjob/libogmjob.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  $(OGMRIP_LIBS)
+ 
+ 
+ #
+@@ -560,7 +576,7 @@
+ libogmrip_mplayer_la_LIBADD = \
+   $(top_builddir)/libogmdvd/libogmdvd.la \
+   $(top_builddir)/libogmjob/libogmjob.la \
+-  libogmrip.la
++  libogmrip.la $(OGMRIP_LIBS)
+ 
+ libogmrip_mplayer_ladir = \
+   $(includedir)/ogmrip
+@@ -578,7 +594,8 @@
+ libogmrip_lavc_la_LIBADD = \
+   $(top_builddir)/libogmdvd/libogmdvd.la \
+   $(top_builddir)/libogmjob/libogmjob.la \
+-  libogmrip.la libogmrip-mplayer.la
++  libogmrip.la libogmrip-mplayer.la \
++  $(OGMRIP_LIBS)
+ 
+ libogmrip_lavc_ladir = \
+   $(includedir)/ogmrip
+@@ -624,8 +641,8 @@
+ @HAVE_THEORA_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_THEORA_SUPPORT_TRUE@libogmrip_theora_la_LIBADD = \
+-@HAVE_THEORA_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_THEORA_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_THEORA_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_THEORA_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
+ 
+ @HAVE_X264_SUPPORT_TRUE@libogmrip_x264_la_SOURCES = \
+ @HAVE_X264_SUPPORT_TRUE@  ogmrip-x264.c
+@@ -636,7 +653,7 @@
+ 
+ @HAVE_X264_SUPPORT_TRUE@libogmrip_x264_la_LIBADD = \
+ @HAVE_X264_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_X264_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_X264_SUPPORT_TRUE@  libogmrip-mplayer.la -lm
+ 
+ 
+ #
+@@ -675,8 +692,8 @@
+ @HAVE_MP3_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_MP3_SUPPORT_TRUE@libogmrip_mp3_la_LIBADD = \
+-@HAVE_MP3_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_MP3_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_MP3_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_MP3_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
+ 
+ @HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_SOURCES = \
+ @HAVE_VORBIS_SUPPORT_TRUE@  ogmrip-vorbis.c
+@@ -686,8 +703,8 @@
+ @HAVE_VORBIS_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_VORBIS_SUPPORT_TRUE@libogmrip_vorbis_la_LIBADD = \
+-@HAVE_VORBIS_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_VORBIS_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_VORBIS_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_VORBIS_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
+ 
+ @HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_SOURCES = \
+ @HAVE_AAC_SUPPORT_TRUE@  ogmrip-aac.c
+@@ -697,8 +714,8 @@
+ @HAVE_AAC_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_AAC_SUPPORT_TRUE@libogmrip_aac_la_LIBADD = \
+-@HAVE_AAC_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_AAC_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_AAC_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_AAC_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la
+ 
+ 
+ #
+@@ -714,8 +731,9 @@
+   -L$(top_builddir)/libogmrip/.libs
+ 
+ libogmrip_vobsub_la_LIBADD = \
+-  libogmrip.la \
+-  libogmrip-mplayer.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  libogmrip.la libogmrip-mplayer.la \
++  $(OGMRIP_LIBS)
+ 
+ @HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_SOURCES = \
+ @HAVE_SRT_SUPPORT_TRUE@  ogmrip-srt.c
+@@ -725,8 +743,9 @@
+ @HAVE_SRT_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_SRT_SUPPORT_TRUE@libogmrip_srt_la_LIBADD = \
+-@HAVE_SRT_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_SRT_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_SRT_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_SRT_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la \
++@HAVE_SRT_SUPPORT_TRUE@  $(OGMRIP_LIBS)
+ 
+ 
+ #
+@@ -754,7 +773,9 @@
+ @HAVE_OGM_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_OGM_SUPPORT_TRUE@libogmrip_ogg_la_LIBADD = \
+-@HAVE_OGM_SUPPORT_TRUE@  libogmrip.la
++@HAVE_OGM_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_OGM_SUPPORT_TRUE@  libogmrip.la \
++@HAVE_OGM_SUPPORT_TRUE@  $(OGMRIP_LIBS)
+ 
+ @HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_SOURCES = \
+ @HAVE_MKV_SUPPORT_TRUE@  ogmrip-mkv.c
+@@ -764,7 +785,10 @@
+ @HAVE_MKV_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_MKV_SUPPORT_TRUE@libogmrip_mkv_la_LIBADD = \
+-@HAVE_MKV_SUPPORT_TRUE@  libogmrip.la
++@HAVE_MKV_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_MKV_SUPPORT_TRUE@  $(top_builddir)/libogmjob/libogmjob.la \
++@HAVE_MKV_SUPPORT_TRUE@  libogmrip.la \
++@HAVE_MKV_SUPPORT_TRUE@  $(OGMRIP_LIBS)
+ 
+ @HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_SOURCES = \
+ @HAVE_MP4_SUPPORT_TRUE@  ogmrip-mp4.c
+@@ -774,8 +798,9 @@
+ @HAVE_MP4_SUPPORT_TRUE@  -L$(top_builddir)/libogmrip/.libs
+ 
+ @HAVE_MP4_SUPPORT_TRUE@libogmrip_mp4_la_LIBADD = \
+-@HAVE_MP4_SUPPORT_TRUE@  libogmrip.la \
+-@HAVE_MP4_SUPPORT_TRUE@  libogmrip-mplayer.la
++@HAVE_MP4_SUPPORT_TRUE@  $(top_builddir)/libogmdvd/libogmdvd.la \
++@HAVE_MP4_SUPPORT_TRUE@  libogmrip.la libogmrip-mplayer.la \
++@HAVE_MP4_SUPPORT_TRUE@  $(OGMRIP_LIBS)
+ 
+ @HAVE_LAVF_SUPPORT_TRUE@libogmrip_mov_la_SOURCES = \
+ @HAVE_LAVF_SUPPORT_TRUE@  ogmrip-mov.c
+diff -Naur ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.am ogmrip-0.12.1/libogmrip-gtk/Makefile.am
+--- ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.am	2008-07-06 13:58:54.000000000 +0200
++++ ogmrip-0.12.1/libogmrip-gtk/Makefile.am	2008-07-15 21:00:34.000000000 +0200
+@@ -26,14 +26,14 @@
+   ogmrip-gtk.h
+ 
+ libogmrip_gtk_la_LDFLAGS = \
+-  -version-info $(OGMRIP_GTK_LT_VERSION) \
+-  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
++  -version-info $(OGMRIP_GTK_LT_VERSION)
+ 
+ libogmrip_gtk_la_LIBADD = \
+-  $(top_builddir)/libogmdvd/libogmdvd.la          \
++  $(top_builddir)/libogmdvd/libogmdvd.la \
+   $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la  \
+-  $(top_builddir)/libogmjob/libogmjob.la          \
+-  $(top_builddir)/libogmrip/libogmrip.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  $(top_builddir)/libogmrip/libogmrip.la \
++  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
+ 
+ #
+ # Options
+@@ -54,7 +54,7 @@
+ 
+ libogmrip_x264_options_la_LIBADD = \
+   $(top_builddir)/libogmrip/libogmrip.la \
+-  libogmrip-gtk.la $(OGMRIP_LIBS)
++  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
+ 
+ libogmrip_lavc_options_la_SOURCES = \
+   ogmrip-lavc-options.c
+@@ -66,7 +66,7 @@
+ libogmrip_lavc_options_la_LIBADD = \
+   $(top_builddir)/libogmrip/libogmrip.la \
+   $(top_builddir)/libogmrip/libogmrip-lavc.la \
+-  libogmrip-gtk.la $(OGMRIP_LIBS)
++  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
+ 
+ #
+ # Misc
+diff -Naur ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.in ogmrip-0.12.1/libogmrip-gtk/Makefile.in
+--- ogmrip-0.12.1.orig/libogmrip-gtk/Makefile.in	2008-07-14 21:14:24.000000000 +0200
++++ ogmrip-0.12.1/libogmrip-gtk/Makefile.in	2008-07-15 20:59:55.000000000 +0200
+@@ -60,27 +60,28 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ options_pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(options_plugin_LTLIBRARIES)
++am__DEPENDENCIES_1 =
+ libogmrip_gtk_la_DEPENDENCIES =  \
+ 	$(top_builddir)/libogmdvd/libogmdvd.la \
+ 	$(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la \
+ 	$(top_builddir)/libogmjob/libogmjob.la \
+-	$(top_builddir)/libogmrip/libogmrip.la
++	$(top_builddir)/libogmrip/libogmrip.la $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libogmrip_gtk_la_OBJECTS = ogmrip-options-plugin.lo \
+ 	ogmrip-source-chooser.lo ogmrip-source-chooser-widget.lo \
+ 	ogmrip-chapter-list.lo ogmrip-chooser-list.lo \
+ 	ogmrip-marshal.lo ogmrip-preferences.lo ogmrip-helper.lo
+ libogmrip_gtk_la_OBJECTS = $(am_libogmrip_gtk_la_OBJECTS)
+-am__DEPENDENCIES_1 =
+ libogmrip_lavc_options_la_DEPENDENCIES =  \
+ 	$(top_builddir)/libogmrip/libogmrip.la \
+ 	$(top_builddir)/libogmrip/libogmrip-lavc.la libogmrip-gtk.la \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libogmrip_lavc_options_la_OBJECTS = ogmrip-lavc-options.lo
+ libogmrip_lavc_options_la_OBJECTS =  \
+ 	$(am_libogmrip_lavc_options_la_OBJECTS)
+ libogmrip_x264_options_la_DEPENDENCIES =  \
+ 	$(top_builddir)/libogmrip/libogmrip.la libogmrip-gtk.la \
+-	$(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libogmrip_x264_options_la_OBJECTS = ogmrip-x264-options.lo
+ libogmrip_x264_options_la_OBJECTS =  \
+ 	$(am_libogmrip_x264_options_la_OBJECTS)
+@@ -364,14 +365,14 @@
+   ogmrip-gtk.h
+ 
+ libogmrip_gtk_la_LDFLAGS = \
+-  -version-info $(OGMRIP_GTK_LT_VERSION) \
+-  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
++  -version-info $(OGMRIP_GTK_LT_VERSION)
+ 
+ libogmrip_gtk_la_LIBADD = \
+-  $(top_builddir)/libogmdvd/libogmdvd.la          \
++  $(top_builddir)/libogmdvd/libogmdvd.la \
+   $(top_builddir)/libogmdvd-gtk/libogmdvd-gtk.la  \
+-  $(top_builddir)/libogmjob/libogmjob.la          \
+-  $(top_builddir)/libogmrip/libogmrip.la
++  $(top_builddir)/libogmjob/libogmjob.la \
++  $(top_builddir)/libogmrip/libogmrip.la \
++  $(DVDREAD_LIBS) $(OGMRIP_LIBS) $(GUI_LIBS)
+ 
+ 
+ #
+@@ -391,7 +392,7 @@
+ 
+ libogmrip_x264_options_la_LIBADD = \
+   $(top_builddir)/libogmrip/libogmrip.la \
+-  libogmrip-gtk.la $(OGMRIP_LIBS)
++  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
+ 
+ libogmrip_lavc_options_la_SOURCES = \
+   ogmrip-lavc-options.c
+@@ -403,7 +404,7 @@
+ libogmrip_lavc_options_la_LIBADD = \
+   $(top_builddir)/libogmrip/libogmrip.la \
+   $(top_builddir)/libogmrip/libogmrip-lavc.la \
+-  libogmrip-gtk.la $(OGMRIP_LIBS)
++  libogmrip-gtk.la $(OGMRIP_LIBS) $(GUI_LIBS)
+ 
+ 
+ #