1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

Fix libdvdcss support.

Remove useless assignments and fix spaces while here.

PR:		ports/143680
Submitted by:	Ganael Laplanche <ganael.laplanche at martymac.com>
Approved by:	maintainer timeout (three months)
This commit is contained in:
Max Brazhnikov 2010-05-15 20:09:05 +00:00
parent c14d49bff3
commit 4a06c8e349
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=254379
4 changed files with 26 additions and 8 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 1.0.5
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF
@ -24,9 +24,7 @@ CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
USE_CDRTOOLS= yes
USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
INSTALLS_ICONS= yes
OPTIONS= FLAC "Add audio/flac decoder" On \
LAME "Add audio/lame encoder (for mp3 files)" On \
@ -127,7 +125,7 @@ RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
.endif
.if defined (WITH_VCDIMAGER)
RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
.endif
.include <bsd.port.post.mk>

View File

@ -0,0 +1,11 @@
--- libk3b/tools/k3blibdvdcss.cpp.orig 2010-02-08 18:49:23.016438402 +0000
+++ libk3b/tools/k3blibdvdcss.cpp 2010-02-08 18:49:35.965396300 +0000
@@ -283,7 +283,7 @@
K3bLibDvdCss* K3bLibDvdCss::create()
{
if( s_libDvdCss == 0 ) {
- s_libDvdCss = dlopen( "libdvdcss.so.2", RTLD_LAZY|RTLD_GLOBAL );
+ s_libDvdCss = dlopen( "libdvdcss.so", RTLD_LAZY|RTLD_GLOBAL );
if( s_libDvdCss ) {
k3b_dvdcss_open = (dvdcss_t (*)(char*))dlsym( s_libDvdCss, "dvdcss_open" );
k3b_dvdcss_close = (int (*)( dvdcss_t ))dlsym( s_libDvdCss, "dvdcss_close" );

View File

@ -7,7 +7,7 @@
PORTNAME= k3b
PORTVERSION= 1.0.5
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils multimedia kde
MASTER_SITES= SF
@ -24,9 +24,7 @@ CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal
USE_GMAKE= yes
USE_CDRTOOLS= yes
USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
USE_KDELIBS_VER= 3
INSTALLS_ICONS= yes
OPTIONS= FLAC "Add audio/flac decoder" On \
LAME "Add audio/lame encoder (for mp3 files)" On \
@ -127,7 +125,7 @@ RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox
.endif
.if defined (WITH_VCDIMAGER)
RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
RUN_DEPENDS+= vcdxrip:${PORTSDIR}/multimedia/vcdimager
.endif
.include <bsd.port.post.mk>

View File

@ -0,0 +1,11 @@
--- libk3b/tools/k3blibdvdcss.cpp.orig 2010-02-08 18:49:23.016438402 +0000
+++ libk3b/tools/k3blibdvdcss.cpp 2010-02-08 18:49:35.965396300 +0000
@@ -283,7 +283,7 @@
K3bLibDvdCss* K3bLibDvdCss::create()
{
if( s_libDvdCss == 0 ) {
- s_libDvdCss = dlopen( "libdvdcss.so.2", RTLD_LAZY|RTLD_GLOBAL );
+ s_libDvdCss = dlopen( "libdvdcss.so", RTLD_LAZY|RTLD_GLOBAL );
if( s_libDvdCss ) {
k3b_dvdcss_open = (dvdcss_t (*)(char*))dlsym( s_libDvdCss, "dvdcss_open" );
k3b_dvdcss_close = (int (*)( dvdcss_t ))dlsym( s_libDvdCss, "dvdcss_close" );