From owner-svn-ports-head@FreeBSD.ORG  Mon Jun 17 09:23:53 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 10C28DDF;
 Mon, 17 Jun 2013 09:23:53 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0320516DA;
 Mon, 17 Jun 2013 09:23:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5H9Nq2V013776;
 Mon, 17 Jun 2013 09:23:52 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5H9Nq5P013775;
 Mon, 17 Jun 2013 09:23:52 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201306170923.r5H9Nq5P013775@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 17 Jun 2013 09:23:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321090 - head/multimedia/handbrake
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jun 2013 09:23:53 -0000

Author: danfe
Date: Mon Jun 17 09:23:52 2013
New Revision: 321090
URL: http://svnweb.freebsd.org/changeset/ports/321090

Log:
  Handbrake tries to dlopen() libdvdcss.so.2, while library installed by the
  libdvdcss package is actually libdvdcss.so.3, so the call always fails and
  handbrake is unable to properly read CSS-encoded DVDs.
  
  Patch in the PR suggested bumping requested shlib version accordingly, but
  methinks it is better to just remove it completely from CSS_LIB definition.
  While here, register run-time dependency on `multimedia/libdvdcss'.
  
  PR:		ports/171473
  Submitted by:	Heath Nielson
  Approved by:	maintainer timeout (dmarion, over 9 months)

Modified:
  head/multimedia/handbrake/Makefile

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Mon Jun 17 08:39:52 2013	(r321089)
+++ head/multimedia/handbrake/Makefile	Mon Jun 17 09:23:52 2013	(r321090)
@@ -3,7 +3,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION} \
 		http://download.handbrake.fr/handbrake/contrib/:contrib
@@ -38,6 +38,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 LIB_DEPENDS=	fribidi:${PORTSDIR}/converters/fribidi
+RUN_DEPENDS=	${LOCALBASE}/lib/libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
 
 USE_AUTOTOOLS=	libtool aclocal
 LIBTOOLFILES=	configure
@@ -125,6 +126,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/contrib/libass/module.defs \
 		${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs
+	@${REINPLACE_CMD} -e 's|libdvdcss\.so\.2|libdvdcss.so|' \
+		${BUILD_WRKSRC}/contrib/libdvdread/libdvdread/src/dvd_input.c
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${PREFIX}/bin