Date: Sunday, September 25, 2016 @ 18:08:14 Author: heftig Revision: 276948
3.22.0+4+g89faff5-1 Modified: totem/trunk/PKGBUILD Deleted: totem/trunk/i686.patch ------------+ PKGBUILD | 50 ++++++++++++++++++++++++++++++-------------------- i686.patch | 13 ------------- 2 files changed, 30 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-25 13:37:34 UTC (rev 276947) +++ PKGBUILD 2016-09-25 18:08:14 UTC (rev 276948) @@ -3,18 +3,17 @@ # Contributor: Jan de Groot <[email protected]> pkgname=totem -pkgver=3.20.1 +pkgver=3.22.0+4+g89faff5 pkgrel=1 -pkgdesc="GNOME3 movie player based on GStreamer" -url="http://www.gnome.org"; +pkgdesc="Movie player for the GNOME desktop based on GStreamer" +url="https://wiki.gnome.org/Apps/Videos"; arch=(i686 x86_64) license=(GPL2 custom) -depends=(totem-plparser desktop-file-utils iso-codes libpeas clutter-gtk clutter-gst grilo - hicolor-icon-theme gsettings-desktop-schemas dconf - python-gobject python-xdg - gst-plugins-base gst-plugins-good gst-plugins-bad gnome-desktop) -makedepends=(intltool libnautilus-extension lirc vala zeitgeist - itstool docbook-xsl python-pylint gobject-introspection) +depends=(totem-plparser iso-codes libpeas clutter-gtk clutter-gst grilo gsettings-desktop-schemas + dconf python-gobject python-xdg gnome-desktop gst-plugins-base gst-plugins-good + gst-plugins-bad) +makedepends=(intltool libnautilus-extension lirc vala zeitgeist itstool docbook-xsl python-pylint + gobject-introspection git gnome-common appstream-glib gtk-doc) optdepends=('gst-plugins-ugly: Extra media codecs' 'gst-libav: Extra media codecs' 'lirc-utils: Infrared Remote Control plugin' @@ -25,18 +24,29 @@ options=('!emptydirs') conflicts=(totem-plugin) replaces=(totem-plugin) -source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - i686.patch) -sha256sums=('6f22480361ae869fd336854b4f83614fde528aff4e808eb716de33432eb45c27' - 'a8daa11c5048d738de8f6db0cb8c41d3904d6c3451fbbf2922a9202b89f8d891') +_commit=89faff5b16d97bd029854126dc0e50e42c0908f2 +source=("git://git.gnome.org/totem#commit=$_commit" + "git://git.gnome.org/libgd") +sha256sums=('SKIP' + 'SKIP') +pkgver() { + cd $pkgname + git describe --tags | sed 's/^V_//;s/_/./g;s/-/+/g' +} + prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../i686.patch + cd $pkgname + + git submodule init + git config --local submodule.libgd.url "$srcdir/libgd" + git submodule update + + NOCONFIGURE=1 ./autogen.sh } build() { - cd "$pkgname-$pkgver" + cd $pkgname ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/totem \ @@ -43,7 +53,8 @@ --localstatedir=/var \ --disable-static \ --enable-python \ - --enable-nautilus + --enable-nautilus \ + --enable-gtk-doc # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -52,8 +63,7 @@ } package() { - cd "$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install - + cd $pkgname + make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" } Deleted: i686.patch =================================================================== --- i686.patch 2016-09-25 13:37:34 UTC (rev 276947) +++ i686.patch 2016-09-25 18:08:14 UTC (rev 276948) @@ -1,13 +0,0 @@ -diff -u -r totem-3.20.1/src/backend/bacon-video-widget.c totem-3.20.1-i686/src/backend/bacon-video-widget.c ---- totem-3.20.1/src/backend/bacon-video-widget.c 2016-03-22 17:45:32.000000000 +0100 -+++ totem-3.20.1-i686/src/backend/bacon-video-widget.c 2016-04-13 22:31:35.477858516 +0200 -@@ -2334,7 +2334,8 @@ - if (!gst_toc_entry_get_start_stop_times (entry, &start, &stop)) { - GST_DEBUG ("Chapter #%d (couldn't get times)", i); - } else { -- GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, start, stop); -+ GST_DEBUG ("Chapter #%d (start: %" G_GINT64_FORMAT " stop: %" G_GINT64_FORMAT ")", -+ i, start, stop); - } - } -
