From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2164558973 for ; Sun, 31 Jan 2016 11:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3E9521C0AE; Sun, 31 Jan 2016 11:49:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28FDE21C0AE for ; Sun, 31 Jan 2016 11:49:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 184BC340CC8 for ; Sun, 31 Jan 2016 11:49:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 628CB8EC for ; Sun, 31 Jan 2016 11:49:46 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1454240981.3d7644a89491fca1116cc0448d5da9e68cea68ca.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/brasero/, app-cdr/brasero/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-cdr/brasero/brasero-3.12.1-r1.ebuild app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch X-VCS-Directories: app-cdr/brasero/files/ app-cdr/brasero/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 3d7644a89491fca1116cc0448d5da9e68cea68ca X-VCS-Branch: master Date: Sun, 31 Jan 2016 11:49:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9a3435ef-fbfa-4ed8-a1f1-1c1779d05b09 X-Archives-Hash: 0acea1541e7df2bdb4b7a87d5143ecd0 commit: 3d7644a89491fca1116cc0448d5da9e68cea68ca Author: Pacho Ramos gentoo org> AuthorDate: Sun Jan 31 11:49:06 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Jan 31 11:49:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7644a8 app-cdr/brasero: Fix detection of libdvdcss (#573422 by Michael Jones) Package-Manager: portage-2.2.27 app-cdr/brasero/brasero-3.12.1-r1.ebuild | 86 ++++++++++++++++++++++ .../brasero/files/brasero-3.12.1-libdvdcss.patch | 18 +++++ 2 files changed, 104 insertions(+) diff --git a/app-cdr/brasero/brasero-3.12.1-r1.ebuild b/app-cdr/brasero/brasero-3.12.1-r1.ebuild new file mode 100644 index 0000000..5b591a4 --- /dev/null +++ b/app-cdr/brasero/brasero-3.12.1-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="CD/DVD burning application for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Brasero" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3 +IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +COMMON_DEPEND=" + >=dev-libs/glib-2.29.14:2 + >=x11-libs/gtk+-3:3[introspection?] + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=dev-libs/libxml2-2.6:2 + >=x11-libs/libnotify-0.6.1:= + + media-libs/libcanberra[gtk3] + x11-libs/libICE + x11-libs/libSM + + introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) + libburn? ( + >=dev-libs/libburn-0.4:= + >=dev-libs/libisofs-0.6.4:= ) + nautilus? ( >=gnome-base/nautilus-2.91.90 ) + playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) + tracker? ( >=app-misc/tracker-0.12:0= ) +" +RDEPEND="${COMMON_DEPEND} + media-libs/gst-plugins-good:1.0 + media-plugins/gst-plugins-meta:1.0 + x11-themes/hicolor-icon-theme + css? ( media-libs/libdvdcss:1.2 ) + !libburn? ( + app-cdr/cdrdao + app-cdr/dvd+rw-tools + virtual/cdrtools ) + mp3? ( + media-libs/gst-plugins-ugly:1.0 + media-plugins/gst-plugins-mad:1.0 ) + packagekit? ( app-admin/packagekit-base ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.50 + dev-util/itstool + >=dev-util/gtk-doc-am-1.12 + sys-devel/gettext + virtual/pkgconfig + test? ( app-text/docbook-xml-dtd:4.3 ) +" +# eautoreconf deps +# app-text/yelp-tools +# gnome-base/gnome-common + +PDEPEND="gnome-base/gvfs" + +src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=744916 + epatch "${FILESDIR}"/${PN}-3.12.1-libdvdcss.patch + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" + gnome2_src_configure \ + --disable-caches \ + $(use_enable !libburn cdrtools) \ + $(use_enable !libburn cdrkit) \ + $(use_enable !libburn cdrdao) \ + $(use_enable !libburn growisofs) \ + $(use_enable introspection) \ + $(use_enable libburn libburnia) \ + $(use_enable nautilus) \ + $(use_enable playlist) \ + $(use_enable tracker search) +} diff --git a/app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch b/app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch new file mode 100644 index 0000000..86b009d --- /dev/null +++ b/app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch @@ -0,0 +1,18 @@ +The current version of libdvdcss has removed the dvdcss_interface_2 symbol so +brasero incorrectly assumes it's the wrong version. + +https://bugzilla.redhat.com/show_bug.cgi?id=1193628 + +diff -Naur brasero-3.12.1.orig/plugins/dvdcss/burn-dvdcss.c brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c +--- brasero-3.12.1.orig/plugins/dvdcss/burn-dvdcss.c 2015-11-12 09:48:53.782886516 -0600 ++++ brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c 2015-11-12 09:53:03.152656908 -0600 +@@ -95,9 +95,6 @@ + if (!module) + goto error_doesnt_exist; + +- if (!g_module_symbol (module, "dvdcss_interface_2", &address)) +- goto error_version; +- + if (!g_module_symbol (module, "dvdcss_open", &address)) + goto error_version; + dvdcss_open = address;