Skip to content

Commit

Permalink
app-cdr/brasero: Fix detection of libdvdcss (#573422 by Michael Jones)
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.27
  • Loading branch information
pacho2 committed Jan 31, 2016
1 parent ceae26a commit 3d7644a
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 0 deletions.
86 changes: 86 additions & 0 deletions app-cdr/brasero/brasero-3.12.1-r1.ebuild
Original file line number Diff line number Diff line change
@@ -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)
}
18 changes: 18 additions & 0 deletions app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 3d7644a

Please sign in to comment.