[arch-commits] Commit in byzanz/repos (4 files)

Felix Yan felixonmars at archlinux.org
Tue Jul 7 12:47:26 UTC 2020


    Date: Tuesday, July 7, 2020 @ 12:47:26
  Author: felixonmars
Revision: 658232

archrelease: copy trunk to community-staging-x86_64

Added:
  byzanz/repos/community-staging-x86_64/
  byzanz/repos/community-staging-x86_64/0001-Port-to-libpanel-applet-5.patch
    (from rev 658231, byzanz/trunk/0001-Port-to-libpanel-applet-5.patch)
  byzanz/repos/community-staging-x86_64/PKGBUILD
    (from rev 658231, byzanz/trunk/PKGBUILD)
  byzanz/repos/community-staging-x86_64/flv-audio.patch
    (from rev 658231, byzanz/trunk/flv-audio.patch)

--------------------------------------+
 0001-Port-to-libpanel-applet-5.patch |  177 +++++++++++++++++++++++++++++++++
 PKGBUILD                             |   46 ++++++++
 flv-audio.patch                      |   46 ++++++++
 3 files changed, 269 insertions(+)

Copied: byzanz/repos/community-staging-x86_64/0001-Port-to-libpanel-applet-5.patch (from rev 658231, byzanz/trunk/0001-Port-to-libpanel-applet-5.patch)
===================================================================
--- community-staging-x86_64/0001-Port-to-libpanel-applet-5.patch	                        (rev 0)
+++ community-staging-x86_64/0001-Port-to-libpanel-applet-5.patch	2020-07-07 12:47:26 UTC (rev 658232)
@@ -0,0 +1,177 @@
+From efe03b6fe075aece3a95bd89eedc83f5f546f1cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Wed, 12 Aug 2015 17:43:00 +0200
+Subject: [PATCH] Port to libpanel-applet 5
+
+This makes byzanz-applet compatible with gnome-panel>=3.14.
+---
+ configure.ac         |  2 +-
+ src/Makefile.am      | 10 ++++++++++
+ src/byzanzapplet.c   | 40 ++++++++++++++++++----------------------
+ src/byzanzapplet.xml |  8 ++++++--
+ 4 files changed, 35 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 620bb26..270b207 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(GTK, cairo >= $CAIRO_REQ gtk+-3.0 >= $GTK_REQ x11 gio-2.0 >= $
+ 
+ PKG_CHECK_MODULES(XDAMAGE, xdamage >= $XDAMAGE_REQ)
+ 
+-LIBPANEL_APPLET="libpanelapplet-4.0"
++LIBPANEL_APPLET="libpanel-applet"
+ PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ,
+                   have_applet=yes, have_applet=no)
+ AM_CONDITIONAL(HAVE_APPLET, [test x$have_applet = xyes])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2f922ed..d9fa297 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -93,6 +93,15 @@ $(applet_in_files): $(applet_in_files).in Makefile
+ 
+ %.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+ 
++servicedir       = $(datadir)/dbus-1/services
++service_in_files = org.gnome.panel.applet.ByzanzAppletFactory.service.in
++service_DATA     = $(service_in_files:.service.in=.service)
++
++org.gnome.panel.applet.ByzanzAppletFactory.service: $(service_in_files)
++	$(AM_V_GEN)sed \
++            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
++            $< > $@
++
+ uidir = $(datadir)/byzanz
+ ui_DATA = byzanzapplet.xml
+ 
+@@ -107,6 +116,7 @@ CLEANFILES = \
+ 
+ EXTRA_DIST = \
+ 	org.gnome.ByzanzApplet.panel-applet.in.in \
++	$(service_in_files)	\
+ 	$(gsettings_schemas_in_in)	\
+ 	$(man_MANS) \
+ 	$(ui_DATA)
+diff --git a/src/byzanzapplet.c b/src/byzanzapplet.c
+index 616acf9..8657180 100644
+--- a/src/byzanzapplet.c
++++ b/src/byzanzapplet.c
+@@ -99,10 +99,10 @@ static struct {
+   const char *  stock_icon;             /* icon to use for this state */
+   gboolean      active;                 /* wether the togglebutton should be active */
+ } state_info[BYZANZ_APPLET_N_STATES] = {
+-  [BYZANZ_APPLET_IDLE] = { N_("Record your desktop"), GTK_STOCK_MEDIA_RECORD, FALSE },
+-  [BYZANZ_APPLET_SELECT_AREA] = { N_("Select area to record"), GTK_STOCK_CANCEL, TRUE },
+-  [BYZANZ_APPLET_RECORDING] = { N_("End current recording"), GTK_STOCK_MEDIA_STOP, TRUE },
+-  [BYZANZ_APPLET_ENCODING] = { N_("Abort encoding of recording"), GTK_STOCK_STOP, TRUE }
++  [BYZANZ_APPLET_IDLE] = { N_("Record your desktop"), "media-record", FALSE },
++  [BYZANZ_APPLET_SELECT_AREA] = { N_("Select area to record"), "gtk-cancel", TRUE },
++  [BYZANZ_APPLET_RECORDING] = { N_("End current recording"), "media-playback-stop", TRUE },
++  [BYZANZ_APPLET_ENCODING] = { N_("Abort encoding of recording"), "process-stop", TRUE }
+ };
+ 
+ static ByzanzAppletState
+@@ -264,7 +264,7 @@ byzanz_applet_start_recording (AppletPrivate *priv)
+ 
+     priv->dialog = gtk_file_chooser_dialog_new (_("Record your desktop"),
+         GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->applet))),
+-        GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
++        GTK_FILE_CHOOSER_ACTION_SAVE, "gtk-cancel", GTK_RESPONSE_CANCEL,
+         NULL);
+     g_assert (G_N_ELEMENTS (method_response_codes) >= byzanz_select_get_method_count ());
+     for (i = 0; i < byzanz_select_get_method_count (); i++) {
+@@ -348,7 +348,7 @@ destroy_applet (GtkWidget *widget, AppletPrivate *priv)
+ }
+ 
+ static void 
+-byzanz_about_cb (GtkAction *action, AppletPrivate *priv)
++byzanz_about_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data)
+ {
+   const gchar *authors[] = {
+     "Benjamin Otte <otte at gnome.org>", 
+@@ -356,7 +356,8 @@ byzanz_about_cb (GtkAction *action, AppletPrivate *priv)
+    };
+ 
+   gtk_show_about_dialog( NULL,
+-    "name",                _("Desktop Session"), 
++    "name",                _("Desktop Session"),
++    "logo-icon-name",      "media-record",
+     "version",             VERSION,
+     "copyright",           "\xC2\xA9 2005-2006 Benjamin Otte",
+     "comments",            _("Record what's happening on your desktop"),
+@@ -365,27 +366,23 @@ byzanz_about_cb (GtkAction *action, AppletPrivate *priv)
+     NULL );
+ }
+ 
+-static const GtkActionEntry byzanz_menu_actions [] = {
+-  { "ByzanzAbout", GTK_STOCK_ABOUT, N_("_About"),
+-    NULL, NULL,
+-    G_CALLBACK (byzanz_about_cb) }
++static const GActionEntry byzanz_menu_actions [] = {
++  { "about", byzanz_about_cb, NULL, NULL, NULL }
+ };
+ 
+ static gboolean
+ byzanz_applet_fill (PanelApplet *applet, const gchar *iid, gpointer data)
+ {
+   AppletPrivate *priv;
+-  GtkActionGroup *action_group;
++  GSimpleActionGroup *action_group;
+   char *ui_path;
+   char *method;
+   
+   if (!index_quark)
+     index_quark = g_quark_from_static_string ("Byzanz-Index");
+-#ifdef GETTEXT_PACKAGE
+   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   textdomain (GETTEXT_PACKAGE);
+-#endif
+ 
+   gtk_window_set_default_icon_name ("byzanz-record-desktop");
+ 
+@@ -394,21 +391,20 @@ byzanz_applet_fill (PanelApplet *applet, const gchar *iid, gpointer data)
+   priv->settings = panel_applet_settings_new (applet, "org.gnome.byzanz.applet");
+ 
+   g_signal_connect (applet, "destroy", G_CALLBACK (destroy_applet), priv);
+-  panel_applet_add_preferences (applet, "/schemas/apps/byzanz-applet/prefs",
+-      NULL);
+   panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
+-  action_group = gtk_action_group_new ("Byzanz Applet Actions");
+-#ifdef GETTEXT_PACKAGE
+-  gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+-#endif
+-  gtk_action_group_add_actions (action_group,
++  action_group = g_simple_action_group_new ();
++  g_action_map_add_action_entries (G_ACTION_MAP (action_group),
+ 				byzanz_menu_actions,
+ 				G_N_ELEMENTS (byzanz_menu_actions),
+ 				priv);
+   ui_path = g_build_filename (BYZANZ_MENU_UI_DIR, "byzanzapplet.xml", NULL);
+   panel_applet_setup_menu_from_file (PANEL_APPLET (applet),
+-				     ui_path, action_group);
++				     ui_path, action_group, GETTEXT_PACKAGE);
+   g_free (ui_path);
++
++  gtk_widget_insert_action_group (GTK_WIDGET (applet), "byzanzapplet",
++                                  G_ACTION_GROUP (action_group));
++
+   g_object_unref (action_group);
+ 
+   method = g_settings_get_string (priv->settings, "method");
+diff --git a/src/byzanzapplet.xml b/src/byzanzapplet.xml
+index d3a6d6c..7c37b24 100644
+--- a/src/byzanzapplet.xml
++++ b/src/byzanzapplet.xml
+@@ -1,2 +1,6 @@
+-<menuitem name="Byzanz About Item" action="ByzanzAbout"/>
+-
++<section>
++       <item>
++               <attribute name="label" translatable="yes">_About</attribute>
++               <attribute name="action">byzanzapplet.about</attribute>
++       </item>
++</section>
+-- 
+2.5.0
+

Copied: byzanz/repos/community-staging-x86_64/PKGBUILD (from rev 658231, byzanz/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 12:47:26 UTC (rev 658232)
@@ -0,0 +1,46 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>
+# Contributor: Luciano A. Ferrer <laferrer at gmail.com>
+
+pkgname=byzanz
+pkgver=0.3.0.1
+_gitrev=81235d235d12c9687897f7fc6ec0de1feaed6623
+pkgrel=5
+pkgdesc="Record what's happening on your desktop"
+arch=('x86_64')
+url="https://gitlab.gnome.org/Archive/byzanz"
+license=('GPL')
+depends=('gtk3' 'gst-plugins-base' 'gst-plugins-good')
+makedepends=('gnome-common' 'intltool' 'git') # 'gnome-panel'
+optdepends=('gst-libav: save into FLV format') # 'gnome-panel: panel applet'
+source=("git+https://gitlab.gnome.org/Archive/byzanz.git#commit=$_gitrev"
+        0001-Port-to-libpanel-applet-5.patch
+        flv-audio.patch)
+sha256sums=('SKIP'
+            'abebbc8116294a8a2a2a43fc9389e075a1d4b0a88731be224e6532daa6ca3577'
+            'e45e15f9c52f9bd72e5f362f0494ebee65e1d2c99ea5b0ca446547c11d6ab4d2')
+
+prepare() {
+  cd $pkgname
+
+  # Port to libpanel-applet 5
+  # patch -Np1 -i ../0001-Port-to-libpanel-applet-5.patch
+
+  # Fix flv audio
+  patch -Np1 -i ../flv-audio.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  CFLAGS+=" -Wno-error"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Copied: byzanz/repos/community-staging-x86_64/flv-audio.patch (from rev 658231, byzanz/trunk/flv-audio.patch)
===================================================================
--- community-staging-x86_64/flv-audio.patch	                        (rev 0)
+++ community-staging-x86_64/flv-audio.patch	2020-07-07 12:47:26 UTC (rev 658232)
@@ -0,0 +1,46 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 4 Feb 2014 03:06:45 +0100
+Subject: audio
+
+---
+ src/byzanzencoderflv.c | 6 +++---
+ src/byzanzencoderogv.c | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/byzanzencoderflv.c b/src/byzanzencoderflv.c
+index 3aaa9a5..1a531d8 100644
+--- a/src/byzanzencoderflv.c
++++ b/src/byzanzencoderflv.c
+@@ -38,10 +38,10 @@ byzanz_encoder_flv_class_init (ByzanzEncoderFlvClass *klass)
+   gtk_file_filter_add_pattern (encoder_class->filter, "*.flv");
+ 
+   gstreamer_class->pipeline_string = 
+-    "appsrc name=src ! videoconvert ! avenc_flashsv buffer-size=8388608 ! flvmux ! giostreamsink name=sink";
++    "appsrc name=src ! videoconvert ! avenc_flashsv ! flvmux ! giostreamsink name=sink";
+   gstreamer_class->audio_pipeline_string = 
+-    "autoaudiosrc name=audiosrc ! audioconvert ! audio/x-raw-int,width=16 ! queue ! flvmux name=muxer ! giostreamsink name=sink "
+-    "appsrc name=src ! videoconvert ! avenc_flashsv buffer-size=8388608 ! muxer.";
++    "autoaudiosrc name=audiosrc ! audioconvert ! audio/x-raw ! queue ! flvmux name=muxer ! giostreamsink name=sink "
++    "appsrc name=src ! videoconvert ! avenc_flashsv ! muxer.";
+ }
+ 
+ static void
+diff --git a/src/byzanzencoderogv.c b/src/byzanzencoderogv.c
+index 9710b52..f282ce1 100644
+--- a/src/byzanzencoderogv.c
++++ b/src/byzanzencoderogv.c
+@@ -38,11 +38,11 @@ byzanz_encoder_ogv_class_init (ByzanzEncoderOgvClass *klass)
+   gtk_file_filter_add_pattern (encoder_class->filter, "*.ogv");
+   gtk_file_filter_add_pattern (encoder_class->filter, "*.ogg");
+ 
+-  gstreamer_class->pipeline_string = 
++  gstreamer_class->pipeline_string =
+     "appsrc name=src ! videoconvert ! videorate !"
+     "video/x-raw,format=Y444,framerate=25/1 ! theoraenc ! oggmux ! giostreamsink name=sink";
+-  gstreamer_class->audio_pipeline_string = 
+-    "autoaudiosrc name=audiosrc ! audioconvert ! queue ! oggmux name=muxer ! giostreamsink name=sink "
++  gstreamer_class->audio_pipeline_string =
++    "autoaudiosrc name=audiosrc ! audioconvert ! vorbisenc ! queue ! oggmux name=muxer ! giostreamsink name=sink "
+     "appsrc name=src ! videoconvert ! videorate ! "
+     "video/x-raw,format=Y444,framerate=25/1 ! theoraenc ! queue ! muxer.";
+ }



More information about the arch-commits mailing list