diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 23:20:21 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 23:20:21 +0000 |
commit | 5c3affb7499915315f371412bfb76233f07cb9b2 (patch) | |
tree | bb90bc0a0ebefc4482bad51e3ca36771714bb868 /media-video | |
parent | punt old. most likely broken with libnotify 0.7 (diff) | |
download | gentoo-2-5c3affb7499915315f371412bfb76233f07cb9b2.tar.gz gentoo-2-5c3affb7499915315f371412bfb76233f07cb9b2.tar.bz2 gentoo-2-5c3affb7499915315f371412bfb76233f07cb9b2.zip |
punt old. broken with libnotify 0.7
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/ogmrip/Manifest | 6 | ||||
-rw-r--r-- | media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch | 64 | ||||
-rw-r--r-- | media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch | 98 | ||||
-rw-r--r-- | media-video/ogmrip/ogmrip-0.13.4.ebuild | 90 | ||||
-rw-r--r-- | media-video/ogmrip/ogmrip-0.13.5.ebuild | 89 |
5 files changed, 0 insertions, 347 deletions
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest index 7a8c6060d0e5..5cdfaf326174 100644 --- a/media-video/ogmrip/Manifest +++ b/media-video/ogmrip/Manifest @@ -1,11 +1,5 @@ -AUX ogmrip-0.13.4-gtk.patch 2539 RMD160 fad5278ae198c0ba36800a7519c69788ce7410a5 SHA1 92e745d7d0197dac4ac242b782034cd322bd8c2b SHA256 71d4845d7b3500958ee94a7551b1af4806f4d9e21c3e70c280f4fdc54723e6b4 -AUX ogmrip-0.13.4-suboptions.patch 2728 RMD160 94427aaef912fe0c679e33985246091605b59f0a SHA1 5de9d36a754b2496d34f9b93436ef7731337bcb7 SHA256 a101765ea13f0e3942450d5eebd5734d65694d5c916671439f8ca7b70c46305f AUX ogmrip-0.13.6-libnotify-0.7.patch 892 RMD160 0864b2428eb934b9a70481004c7a91cc4af538fb SHA1 0268af409a9468efcd4c044cd191d8759512a6e4 SHA256 afb800738373a540be287287990bf84ac03cb398856b689e1b9f8043b1757b71 -DIST ogmrip-0.13.4.tar.gz 3322432 RMD160 62951486f4bcfcdcf7075efb203ed4c620b259ec SHA1 dfe48d174107ff4d2b55e69b82fbf84e37498ab2 SHA256 b954bb2b990933a7abbb6fab8fcf7d7edd1cde8b0a9c790806cd16ddc9c4b068 -DIST ogmrip-0.13.5.tar.gz 3342721 RMD160 8cd9dbbe0786c1ec8cd8af3cce4a0babed562a69 SHA1 bc9c718d81f26b048849590e9aedbac4e03ed55e SHA256 b8d60b25ab6484c07f5e764a10076679da39b325bba17fa5d52a3cf8dc3f447f DIST ogmrip-0.13.6.tar.gz 3242380 RMD160 6116e7c22e747bd8ecd6444575537f2ebc16d062 SHA1 41917a11a44fb73c73daaa8ac29ae3dddb478b67 SHA256 f1b70fc68951401dbd43c9b1016fd2c37b1fda004d76cf6bb82c8a44742a5d24 -EBUILD ogmrip-0.13.4.ebuild 2424 RMD160 5c5fe832089625a558ee16f4b235b3312b01e4b8 SHA1 b1ef9235b3a2b20ed69ab4120f0f181ee3357705 SHA256 d5a9552782bc17d7a1cd497b4d9e34e88a743210d20d290a96d04593d847834c -EBUILD ogmrip-0.13.5.ebuild 2392 RMD160 f2ad914a11edd137cc73ac160940ff3e5d988a66 SHA1 d7bb3cd88e747c42eb5c1a92486d482da430676c SHA256 7f4cc053dc490fd56516a370e69a788a1ba29ce142580b94c64a2848cedb2fde EBUILD ogmrip-0.13.6.ebuild 2440 RMD160 0887b7fb928a1f7b25e9feeef3f27af467194d01 SHA1 29cd7bcdd8c92bf460765f3421535d313b05e98b SHA256 cbcc475678acd52123469f938f415268b5e5e9a77112f9f3881b1428d6cd53a9 MISC ChangeLog 8147 RMD160 a839537a2fa76bce64d7b90f9a0a0cc822e92396 SHA1 3facc88687d1cdba5a9844c67c6b72554e30e8dc SHA256 3b082e9ef36fe6794376b35928e50d51184f90599706b761e081221dff0e7d5e MISC metadata.xml 449 RMD160 b535f21bb82fe18f270c623e9246fada5d4f389a SHA1 d45301a60016eeda1698a9b02de8326ef4bbbeeb SHA256 7ddfc7f6e9ffd1f154c7bfad79dba0672cfc3da9d369d09175d06106eb345d36 diff --git a/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch b/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch deleted file mode 100644 index 0e1a8fc59f8f..000000000000 --- a/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: src/ogmrip-main.c -=================================================================== ---- src/ogmrip-main.c (révision 1960) -+++ src/ogmrip-main.c (copie de travail) -@@ -1452,7 +1452,7 @@ - - ogmrip_encoding_set_relative (encoding, - #if GTK_CHECK_VERSION(2,18,0) -- gtk_widget_get_sensitive (data->relative_check) & -+ gtk_widget_is_sensitive (data->relative_check) & - #else - GTK_WIDGET_IS_SENSITIVE (data->relative_check) & - #endif -Index: src/ogmrip-options-dialog.c -=================================================================== ---- src/ogmrip-options-dialog.c (révision 1960) -+++ src/ogmrip-options-dialog.c (copie de travail) -@@ -971,13 +971,21 @@ - gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_ENQUEUE); - gtk_widget_show (widget); - -+#if GTK_CHECK_VERSION(2,18,0) -+ gtk_widget_set_can_focus (widget, TRUE); -+#else - GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT); -+#endif - - widget = gtk_button_new_with_image (_("E_xtract"), GTK_STOCK_CONVERT); - gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_EXTRACT); - gtk_widget_show (widget); - -+#if GTK_CHECK_VERSION(2,18,0) -+ gtk_widget_set_can_focus (widget, TRUE); -+#else - GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT); -+#endif - - ogmrip_settings_bind_custom (settings, OGMRIP_GCONF_GENERAL, OGMRIP_GCONF_PROFILE, - G_OBJECT (OGMRIP_OPTIONS_DIALOG (dialog)->priv->profile_combo), "active", -@@ -1294,7 +1302,7 @@ - - return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->test_check)) && - #if GTK_CHECK_VERSION(2,18,0) -- gtk_widget_get_sensitive (dialog->priv->test_check); -+ gtk_widget_is_sensitive (dialog->priv->test_check); - #else - GTK_WIDGET_IS_SENSITIVE (dialog->priv->test_check); - #endif -Index: libogmrip-gtk/ogmrip-source-chooser-widget.c -=================================================================== ---- libogmrip-gtk/ogmrip-source-chooser-widget.c (révision 1960) -+++ libogmrip-gtk/ogmrip-source-chooser-widget.c (copie de travail) -@@ -543,7 +543,11 @@ - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser)); - -+#if GTK_CHECK_VERSION(2,18,0) -+ if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel)) -+#else - if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel)) -+#endif - { - if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (chooser->priv->dialog))) - gtk_window_set_transient_for (GTK_WINDOW (chooser->priv->dialog), GTK_WINDOW (toplevel)); diff --git a/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch b/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch deleted file mode 100644 index b8596feed692..000000000000 --- a/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- libogmrip/ogmrip-x264.c.orig 2010-04-13 09:21:48.000000000 +0200 -+++ libogmrip/ogmrip-x264.c 2010-04-13 09:19:34.000000000 +0200 -@@ -835,7 +835,7 @@ - ogmrip_x264_check_option (const gchar *option) - { - GPtrArray *argv; -- gchar *options; -+ gchar *options, *output = NULL; - gint status; - - argv = g_ptr_array_new (); -@@ -843,7 +843,7 @@ - g_ptr_array_add (argv, "mencoder"); - g_ptr_array_add (argv, "-nocache"); - g_ptr_array_add (argv, "-nosound"); -- g_ptr_array_add (argv, "-really-quiet"); -+ g_ptr_array_add (argv, "-quiet"); - g_ptr_array_add (argv, "-frames"); - g_ptr_array_add (argv, "0"); - g_ptr_array_add (argv, "-rawvideo"); -@@ -863,13 +863,26 @@ - g_ptr_array_add (argv, NULL); - - g_spawn_sync (NULL, (gchar **) argv->pdata, NULL, -- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, -- NULL, NULL, NULL, NULL, &status, NULL); -+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL, -+ NULL, NULL, NULL, &output, &status, NULL); - - g_ptr_array_free (argv, TRUE); - - g_free (options); - -+ if (status == 0 && output != NULL) -+ { -+ gchar *substr; -+ -+ substr = g_strdup_printf ("Option x264encopts: Unknown suboption %s", option); -+ if (strstr (output, substr)) -+ status = 1; -+ g_free (substr); -+ } -+ -+ if (output) -+ g_free (output); -+ - return status == 0; - } - ---- libogmrip/ogmrip-xvid.c.orig 2010-04-13 09:21:23.000000000 +0200 -+++ libogmrip/ogmrip-xvid.c 2010-04-13 09:19:39.000000000 +0200 -@@ -851,7 +851,7 @@ - ogmrip_xvid_check_option (const gchar *option) - { - GPtrArray *argv; -- gchar *options; -+ gchar *options, *output = NULL; - gint status; - - argv = g_ptr_array_new (); -@@ -859,7 +859,7 @@ - g_ptr_array_add (argv, "mencoder"); - g_ptr_array_add (argv, "-nocache"); - g_ptr_array_add (argv, "-nosound"); -- g_ptr_array_add (argv, "-really-quiet"); -+ g_ptr_array_add (argv, "-quiet"); - g_ptr_array_add (argv, "-frames"); - g_ptr_array_add (argv, "0"); - g_ptr_array_add (argv, "-rawvideo"); -@@ -879,13 +879,26 @@ - g_ptr_array_add (argv, NULL); - - g_spawn_sync (NULL, (gchar **) argv->pdata, NULL, -- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, -- NULL, NULL, NULL, NULL, &status, NULL); -+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL, -+ NULL, NULL, NULL, &output, &status, NULL); - - g_ptr_array_free (argv, TRUE); - - g_free (options); - -+ if (status == 0 && output != NULL) -+ { -+ gchar *substr; -+ -+ substr = g_strdup_printf ("Option xvidencopts: Unknown suboption %s", option); -+ if (strstr (output, substr)) -+ status = 1; -+ g_free (substr); -+ } -+ -+ if (output) -+ g_free (output); -+ - return status == 0; - } - diff --git a/media-video/ogmrip/ogmrip-0.13.4.ebuild b/media-video/ogmrip/ogmrip-0.13.4.ebuild deleted file mode 100644 index f80fcd8755d8..000000000000 --- a/media-video/ogmrip/ogmrip-0.13.4.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.4.ebuild,v 1.2 2010/04/27 10:35:50 ssuominen Exp $ - -EAPI=2 -GCONF_DEBUG=no -inherit eutils gnome2 - -DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4" -HOMEPAGE="http://ogmrip.sourceforge.net/" -SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid" - -COMMON_DEPEND=">=dev-libs/glib-2.16:2 - >=app-i18n/enca-1.9 - dev-libs/libxml2 - media-libs/libdvdread - >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] - aac? ( >=media-libs/faac-1.24 ) - gtk? ( - >=x11-libs/gtk+-2.12:2 - gnome-base/libglade - gnome-base/gconf - dbus? ( dev-libs/dbus-glib ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - media-video/mplayer[jpeg] - ) - matroska? ( media-video/mkvtoolnix ) - mp3? ( media-sound/lame ) - mp4? ( >=media-video/gpac-0.4.2 ) - ogm? ( media-sound/ogmtools ) - spell? ( >=app-text/enchant-1.1.0 ) - srt? ( || - ( - ( >=app-text/tesseract-2 media-libs/tiff ) - >=app-text/gocr-0.39 - >=app-text/ocrad-0.15 - ) - media-libs/libpng ) - theora? ( media-libs/libtheora ) - vorbis? ( media-sound/vorbis-tools )" -RDEPEND="${COMMON_DEPEND} - gnome-base/gvfs" -DEPEND="${COMMON_DEPEND} - nls? ( sys-devel/gettext - dev-util/intltool ) - dev-util/pkgconfig" - -pkg_setup() { - DOCS="AUTHORS ChangeLog README TODO" - - G2CONF="--disable-dependency-tracking - --disable-static - $(use_enable gtk gtk-support) - $(use_enable dbus dbus-support) - $(use_enable spell enchant-support) - $(use_enable ogm ogm-support) - $(use_enable matroska mkv-support) - $(use_enable mp4 mp4-support) - $(use_enable xvid xvid-support) - $(use_enable x264 x264-support) - $(use_enable theora theora-support) - $(use_enable vorbis vorbis-support) - $(use_enable mp3 mp3-support) - $(use_enable aac aac-support) - $(use_enable srt srt-support) - $(use_enable libnotify libnotify-support) - $(use_enable nls) - --with-html-dir=/usr/share/doc/${PF}/html" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gtk.patch \ - "${FILESDIR}"/${P}-suboptions.patch - - sed -i \ - -e '/DISABLE_DEPRECATED/d' \ - configure || die - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - find "${D}" -name '*.la' -delete -} diff --git a/media-video/ogmrip/ogmrip-0.13.5.ebuild b/media-video/ogmrip/ogmrip-0.13.5.ebuild deleted file mode 100644 index 09d99e26e92c..000000000000 --- a/media-video/ogmrip/ogmrip-0.13.5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.5.ebuild,v 1.2 2010/07/30 14:48:37 flameeyes Exp $ - -EAPI=2 -GCONF_DEBUG=no -inherit eutils gnome2 - -DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4" -HOMEPAGE="http://ogmrip.sourceforge.net/" -SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid" - -COMMON_DEPEND=">=dev-libs/glib-2.16:2 - >=app-i18n/enca-1.9 - dev-libs/libxml2 - media-libs/libdvdread - >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] - aac? ( >=media-libs/faac-1.24 ) - gtk? ( - >=x11-libs/gtk+-2.12:2 - gnome-base/libglade - gnome-base/gconf - dbus? ( dev-libs/dbus-glib ) - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - media-video/mplayer[jpeg] - ) - matroska? ( media-video/mkvtoolnix ) - mp3? ( media-sound/lame ) - mp4? ( >=media-video/gpac-0.4.2 ) - ogm? ( media-sound/ogmtools ) - spell? ( >=app-text/enchant-1.1.0 ) - srt? ( || - ( - ( >=app-text/tesseract-2 media-libs/tiff ) - >=app-text/gocr-0.39 - >=app-text/ocrad-0.15 - ) - media-libs/libpng ) - theora? ( media-libs/libtheora ) - vorbis? ( media-sound/vorbis-tools )" -RDEPEND="${COMMON_DEPEND} - gnome-base/gvfs" -DEPEND="${COMMON_DEPEND} - nls? ( sys-devel/gettext - dev-util/intltool ) - dev-util/pkgconfig" - -pkg_setup() { - DOCS="AUTHORS ChangeLog README TODO" - - G2CONF="--disable-dependency-tracking - --disable-static - $(use_enable gtk gtk-support) - $(use_enable dbus dbus-support) - $(use_enable spell enchant-support) - $(use_enable ogm ogm-support) - $(use_enable matroska mkv-support) - $(use_enable mp4 mp4-support) - $(use_enable xvid xvid-support) - $(use_enable x264 x264-support) - $(use_enable theora theora-support) - $(use_enable vorbis vorbis-support) - $(use_enable mp3 mp3-support) - $(use_enable aac aac-support) - $(use_enable srt srt-support) - $(use_enable libnotify libnotify-support) - $(use_enable nls) - --with-html-dir=/usr/share/doc/${PF}/html" -} - -src_prepare() { - sed -i \ - -e '/DISABLE_DEPRECATED/d' \ - configure || die - - gnome2_src_prepare -} - -src_install() { - # bug #317607 - MAKEOPTS="${MAKEOPTS} -j1" \ - gnome2_src_install - find "${D}" -name '*.la' -delete -} |