Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=bc3818b6a691984fda519842f701163d99c285e3
commit bc3818b6a691984fda519842f701163d99c285e3 Author: James Buren <[email protected]> Date: Thu May 10 06:40:44 2012 -0500 handbrake-0.9.6-1-x86_64 * version bump * remove old patches diff --git a/source/xmultimedia-extra/handbrake/FrugalBuild b/source/xmultimedia-extra/handbrake/FrugalBuild index e22b54e..07277f1 100644 --- a/source/xmultimedia-extra/handbrake/FrugalBuild +++ b/source/xmultimedia-extra/handbrake/FrugalBuild @@ -4,10 +4,10 @@ pkgname=handbrake _F_sourceforge_name="HandBrake" _F_sourceforge_ext=".tar.bz2" -pkgver=0.9.5 -pkgrel=2 +pkgver=0.9.6 +pkgrel=1 pkgdesc="HandBrake is an open-source, multiplatform, multithreaded video transcoder" -depends=("libstdc++") +depends=("icu4c>=4.8.1.1" "fribidi") makedepends=('intltool' 'jam' 'subversion' 'yasm') groups=('xmultimedia-extra') archs=('i686' 'x86_64') @@ -16,12 +16,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache=y Finclude gnome-scriptlet sourceforge unset install -source=($source \ - libnotify-0.7.patch \ - dbus-glib.patch) -sha1sums=('6db599fe96a640e5355f1c92b8915f11c7cb45ad' \ - '663d49f73c6c84dcba1ce90b3eb608627e131a70' \ - '5315a1632a50e12e8bef696dbcbd9da88a6cacea') +sha1sums=('d4895a2efa2c7a09a79ebea9bb465318dba5e660') subpkgs=("gtk-handbrake") subdescs=('gtk gui for handbrake') subdepends=("webkit>=1.3.4 hal libnotify>=0.7.4 libgudev") diff --git a/source/xmultimedia-extra/handbrake/dbus-glib.patch b/source/xmultimedia-extra/handbrake/dbus-glib.patch deleted file mode 100644 index 602918a..0000000 --- a/source/xmultimedia-extra/handbrake/dbus-glib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur HandBrake-0.9.5.orig/gtk/configure.ac HandBrake-0.9.5/gtk/configure.ac ---- HandBrake-0.9.5.orig/gtk/configure.ac 2011-03-07 13:06:20.333338164 -0800 -+++ HandBrake-0.9.5/gtk/configure.ac 2011-03-07 13:07:46.346670456 -0800 -@@ -94,7 +94,7 @@ - mingw_flag=yes - ;; - *) -- GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify gudev-1.0" -+ GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify gudev-1.0 dbus-glib-1" - mingw_flag=no - ;; - esac diff --git a/source/xmultimedia-extra/handbrake/gtk2.20_fixes.patch b/source/xmultimedia-extra/handbrake/gtk2.20_fixes.patch deleted file mode 100644 index 63b0947..0000000 --- a/source/xmultimedia-extra/handbrake/gtk2.20_fixes.patch +++ /dev/null @@ -1,248 +0,0 @@ -Index: gtk/src/settings.c -=================================================================== ---- gtk/src/settings.c (revision 3134) -+++ gtk/src/settings.c (revision 3135) -@@ -179,17 +179,14 @@ - // Map widget names to setting keys - // Widgets that map to settings have names - // of this format: s_<setting key> --static const gchar* --get_setting_key(GtkWidget *widget) -+const gchar* -+ghb_get_setting_key(GtkWidget *widget) - { - const gchar *name; - - g_debug("get_setting_key ()\n"); - if (widget == NULL) return NULL; -- if (GTK_IS_ACTION(widget)) -- name = gtk_action_get_name(GTK_ACTION(widget)); -- else -- name = gtk_widget_get_name(widget); -+ name = gtk_buildable_get_name(GTK_BUILDABLE(widget)); - - if (name == NULL) - { -@@ -214,10 +211,7 @@ - } - - type = GTK_WIDGET_TYPE(widget); -- if (GTK_IS_ACTION(widget)) -- name = gtk_action_get_name(GTK_ACTION(widget)); -- else -- name = gtk_widget_get_name(widget); -+ name = ghb_get_setting_key(widget); - g_debug("ghb_widget_value widget (%s)\n", name); - if (type == GTK_TYPE_ENTRY) - { -@@ -442,7 +436,7 @@ - if (widget == NULL) return; - g_debug("ghb_widget_to_setting"); - // Find corresponding setting -- key = get_setting_key(widget); -+ key = ghb_get_setting_key(widget); - if (key == NULL) return; - value = ghb_widget_value(widget); - if (value != NULL) -Index: gtk/src/settings.h -=================================================================== ---- gtk/src/settings.h (revision 3134) -+++ gtk/src/settings.h (revision 3135) -@@ -108,5 +108,6 @@ - void ghb_widget_to_setting(GValue *settings, GtkWidget *widget); - int ghb_ui_update( - signal_user_data_t *ud, const gchar *name, const GValue *value); -+const gchar* ghb_get_setting_key(GtkWidget *widget); - - #endif // _SETTINGS_H_ -Index: gtk/src/preview.c -=================================================================== ---- gtk/src/preview.c (revision 3134) -+++ gtk/src/preview.c (revision 3135) -@@ -877,7 +877,7 @@ - ghb_widget_to_setting (ud->settings, xwidget); - ghb_preview_set_visible(ud); - ghb_check_dependency(ud, xwidget, NULL); -- const gchar *name = gtk_widget_get_name(xwidget); -+ const gchar *name = ghb_get_setting_key(xwidget); - ghb_pref_save(ud->settings, name); - } - -@@ -934,7 +934,7 @@ - g_debug("fullscreen_clicked_cb()"); - ghb_widget_to_setting (ud->settings, toggle); - ghb_check_dependency(ud, toggle, NULL); -- const gchar *name = gtk_widget_get_name(toggle); -+ const gchar *name = ghb_get_setting_key(toggle); - ghb_pref_save(ud->settings, name); - - window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window")); -@@ -1030,7 +1030,7 @@ - ghb_live_reset(ud); - ghb_widget_to_setting (ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - } - -Index: gtk/src/audiohandler.c -=================================================================== ---- gtk/src/audiohandler.c (revision 3134) -+++ gtk/src/audiohandler.c (revision 3135) -@@ -478,7 +478,7 @@ - G_MODULE_EXPORT void - subtitle_changed_cb(GtkWidget *widget, signal_user_data_t *ud) - { -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - g_debug("subtitle_changed_cb () %s", name); - ghb_widget_to_setting(ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); -Index: gtk/src/x264handler.c -=================================================================== ---- gtk/src/x264handler.c (revision 3134) -+++ gtk/src/x264handler.c (revision 3135) -@@ -523,7 +523,7 @@ - x264_opt_update(signal_user_data_t *ud, GtkWidget *widget) - { - gint jj; -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - gchar **opt_syns = NULL; - const gchar *def_val = NULL; - gint type; -Index: gtk/src/callbacks.c -=================================================================== ---- gtk/src/callbacks.c (revision 3134) -+++ gtk/src/callbacks.c (revision 3135) -@@ -199,7 +199,7 @@ - type = GTK_WIDGET_TYPE(widget); - if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY) - if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return; -- name = gtk_widget_get_name(widget); -+ name = ghb_get_setting_key(widget); - } - else - name = alt_name; -@@ -1054,7 +1054,7 @@ - gchar *sourcename; - - sourcename = ghb_settings_get_string(ud->settings, "source"); -- filename = gtk_action_get_name(action); -+ filename = gtk_buildable_get_name(GTK_BUILDABLE(action)); - ghb_do_scan(ud, filename, 0, TRUE); - if (strcmp(sourcename, filename) != 0) - { -@@ -1694,7 +1694,7 @@ - G_MODULE_EXPORT void - target_size_changed_cb(GtkWidget *widget, signal_user_data_t *ud) - { -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - g_debug("target_size_changed_cb () %s", name); - ghb_widget_to_setting(ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); -@@ -1713,7 +1713,7 @@ - start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud) - { - gint start, end; -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - - g_debug("start_point_changed_cb () %s", name); - ghb_widget_to_setting(ud->settings, widget); -@@ -1765,7 +1765,7 @@ - end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud) - { - gint start, end; -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - - g_debug("end_point_changed_cb () %s", name); - ghb_widget_to_setting(ud->settings, widget); -@@ -3588,7 +3588,7 @@ - g_debug("pref_changed_cb"); - ghb_widget_to_setting (ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - } - -@@ -3598,7 +3598,7 @@ - g_debug("use_m4v_changed_cb"); - ghb_widget_to_setting (ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - ghb_update_destination_extension(ud); - } -@@ -3609,7 +3609,7 @@ - g_debug("show_status_cb"); - ghb_widget_to_setting (ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - - GtkStatusIcon *si; -@@ -3626,7 +3626,7 @@ - ghb_widget_to_setting (ud->settings, widget); - ghb_check_dependency(ud, widget, NULL); - -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - - gdouble vqmin, vqmax, step, page; -@@ -3643,7 +3643,7 @@ - { - g_debug("tweaks_changed_cb"); - ghb_widget_to_setting (ud->settings, widget); -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - } - -@@ -3652,7 +3652,7 @@ - { - g_debug("hbfd_feature_changed_cb"); - ghb_widget_to_setting (ud->settings, widget); -- const gchar *name = gtk_widget_get_name(widget); -+ const gchar *name = ghb_get_setting_key(widget); - ghb_pref_save(ud->settings, name); - - gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd_feature"); -@@ -4559,7 +4559,7 @@ - GtkResponseType response; - gchar *tweak = NULL; - -- name = gtk_widget_get_name(widget); -+ name = ghb_get_setting_key(widget); - if (g_str_has_prefix(name, "tweak_")) - { - tweak_name = g_strdup(name); -Index: gtk/src/main.c -=================================================================== ---- gtk/src/main.c (revision 3134) -+++ gtk/src/main.c (revision 3135) -@@ -152,7 +152,7 @@ - g_return_if_fail(handler_name != NULL); - g_return_if_fail(signal_name != NULL); - -- //const gchar *name = gtk_widget_get_name((GtkWidget*)object); -+ //const gchar *name = ghb_get_setting_key((GtkWidget*)object); - //g_message("\n\nname %s", name); - g_debug("handler_name %s", handler_name); - g_debug("signal_name %s", signal_name); -@@ -192,7 +192,7 @@ - font_desc = pango_font_description_from_string(font); - if (font_desc == NULL) exit(1); - gtk_widget_modify_font(widget, font_desc); -- name = gtk_widget_get_name(widget); -+ name = ghb_get_setting_key(widget); - g_debug("changing font for widget %s\n", name); - if (GTK_IS_CONTAINER(widget)) - { diff --git a/source/xmultimedia-extra/handbrake/libnotify-0.7.patch b/source/xmultimedia-extra/handbrake/libnotify-0.7.patch deleted file mode 100644 index 0def152..0000000 --- a/source/xmultimedia-extra/handbrake/libnotify-0.7.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur HandBrake-0.9.5.orig/gtk/src/callbacks.c HandBrake-0.9.5/gtk/src/callbacks.c ---- HandBrake-0.9.5.orig/gtk/src/callbacks.c 2011-03-07 13:06:20.333338164 -0800 -+++ HandBrake-0.9.5/gtk/src/callbacks.c 2011-03-07 13:21:32.973338933 -0800 -@@ -39,6 +39,10 @@ - #endif - - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - #include <gdk/gdkx.h> - #else - #define WINVER 0x0500 -@@ -4889,9 +4893,13 @@ - notification = notify_notification_new( - "Encode Complete", - "Put down that cocktail, Your HandBrake queue is done!", -- "hb-icon", -- NULL); -+ "hb-icon" -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ ,NULL); - notify_notification_attach_to_status_icon(notification, si); -+#endif - g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud); - notify_notification_show(notification, NULL); - #endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
