mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

- Remove USE_REINPLACE. [1]

Browse Source 
- Use DATADIR macro. [1]
- Make WITHOUT knobs actually disable features with configure. [1]
- Fix build error for the case when libtool15 is not installed. [2]
- Correct pkg-plist. [2]
- Modify files/patch-configure to disable libtheora support properly for WITHOUT_THEORA knob.

PR:		ports/95639 [1], ports/96140 [2]
Submitted by:	Alexander Botero-Lowry <alex@foxybanana.com> [1], oliver [2]
This commit is contained in:
MANTANI Nobutaka 2006-04-30 17:26:43 +00:00
parent 1fcc002e35
commit 98d6e8cbc1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=160930
3 changed files with 61 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
multimedia/libxine/Makefile
View File

@ -41,7 +41,6 @@ USE_GNOME= gnomehack gnometarget
USE_GMAKE= yes
USE_GL= yes
USE_SDL= sdl
USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@ -68,6 +67,7 @@ LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
PLIST_SUB+= WITH_ARTS=""
.else
PLIST_SUB+= WITH_ARTS="@comment "
CONFIGURE_ARGS+= --disable-arts --disable-artstest
.endif
.if !defined(WITHOUT_CACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_CACA))
@ -75,6 +75,7 @@ BUILD_DEPENDS+= caca-config:${PORTSDIR}/graphics/libcaca
PLIST_SUB+= WITH_CACA=""
.else
PLIST_SUB+= WITH_CACA="@comment "
CONFIGURE_ARGS+= --disable-caca --disable-cacatest
.endif
.if !defined(WITHOUT_ESOUND) && (${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND))
@ -82,6 +83,7 @@ USE_GNOME+= esound
PLIST_SUB+= WITH_ESOUND=""
.else
PLIST_SUB+= WITH_ESOUND="@comment "
CONFIGURE_ARGS+= --disable-esd --disable-esdtest
.endif
.if !defined(WITHOUT_GNOMEVFS2) && (${HAVE_GNOME:Mgnomevfs2} != "" || defined(WITH_GNOMEVFS2))
@ -89,6 +91,7 @@ USE_GNOME+= gnomevfs2
PLIST_SUB+= WITH_GNOMEVFS2=""
.else
PLIST_SUB+= WITH_GNOMEVFS2="@comment "
CONFIGURE_ARGS+= --disable-gnome
.endif
.if !defined(WITHOUT_POLYPAUDIO) && (exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) || defined(WITH_POLYPAUDIO))
@ -96,12 +99,14 @@ LIB_DEPENDS+= polyp-0.7.0:${PORTSDIR}/audio/polypaudio
PLIST_SUB+= WITH_POLYPAUDIO=""
.else
PLIST_SUB+= WITH_POLYPAUDIO="@comment "
CONFIGURE_ARGS+= --disable-polypaudio
.endif
.if ${ARCH} == "i386"
PLIST_SUB+= WITH_VIDIX=""
.else
PLIST_SUB+= WITH_VIDIX="@comment "
CONFIGURE_ARGS+= --disable-vidix
.endif
.if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC))
@ -117,6 +122,7 @@ LIB_DEPENDS+= theora.1:${PORTSDIR}/multimedia/libtheora
PLIST_SUB+= WITH_THEORA=""
.else
PLIST_SUB+= WITH_THEORA="@comment "
CONFIGURE_ARGS+= --disable-theoratest
.endif
.if !defined(WITHOUT_SMB) && (exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB))
@ -124,6 +130,7 @@ LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
PLIST_SUB+= WITH_SMB=""
.else
PLIST_SUB+= WITH_SMB="@comment "
CONFIGURE_ARGS+= --disable-samba
.endif
pre-everything::
@ -186,6 +193,8 @@ post-patch:
s|-malign-jumps|-falign-jumps|g ; \
s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
.endif
pre-build:
${CP} ${LTMAIN} ${WRKSRC}/ltmain.sh
.include <bsd.port.post.mk>

13
multimedia/libxine/files/patch-configure
View File

@ -1,5 +1,5 @@
--- configure.orig Sun Dec 11 03:18:42 2005
+++ configure Sun Dec 11 03:23:42 2005
--- configure.orig Tue Nov 15 20:40:27 2005
+++ configure Mon May 1 01:33:08 2006
@@ -26269,7 +26269,7 @@
"ac_cv_lib_avcodec_pp_get_context" \
"ac_cv_lib_postproc_pp_get_context" \
@ -18,3 +18,12 @@
cat >conftest.$ac_ext <<_ACEOF
#include <avcodec.h>
#include <postprocess.h>
@@ -35293,6 +35293,8 @@
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
+else
+no_theora=yes
fi
if test "x$no_theora" = x ; then

79
multimedia/libxine/pkg-plist
View File

@ -32,6 +32,7 @@ include/xine/xineintl.h
include/xine/xineutils.h
include/xine/xmllexer.h
include/xine/xmlparser.h
lib/libxine.la
lib/libxine.so
lib/libxine.so.15
lib/xine/plugins/1.1.1/post/xineplug_post_audio_filters.so
@ -167,42 +168,42 @@ share/locale/it/LC_MESSAGES/libxine1.mo
share/locale/pl/LC_MESSAGES/libxine1.mo
share/locale/pt_BR/LC_MESSAGES/libxine1.mo
share/locale/sk/LC_MESSAGES/libxine1.mo
share/xine/libxine1/fonts/cc-16.xinefont.gz
share/xine/libxine1/fonts/cc-20.xinefont.gz
share/xine/libxine1/fonts/cc-24.xinefont.gz
share/xine/libxine1/fonts/cc-32.xinefont.gz
share/xine/libxine1/fonts/cc-48.xinefont.gz
share/xine/libxine1/fonts/cc-64.xinefont.gz
share/xine/libxine1/fonts/cci-16.xinefont.gz
share/xine/libxine1/fonts/cci-20.xinefont.gz
share/xine/libxine1/fonts/cci-24.xinefont.gz
share/xine/libxine1/fonts/cci-32.xinefont.gz
share/xine/libxine1/fonts/cci-48.xinefont.gz
share/xine/libxine1/fonts/cci-64.xinefont.gz
share/xine/libxine1/fonts/cetus-16.xinefont.gz
share/xine/libxine1/fonts/cetus-20.xinefont.gz
share/xine/libxine1/fonts/cetus-24.xinefont.gz
share/xine/libxine1/fonts/cetus-32.xinefont.gz
share/xine/libxine1/fonts/cetus-48.xinefont.gz
share/xine/libxine1/fonts/cetus-64.xinefont.gz
share/xine/libxine1/fonts/mono-16.xinefont.gz
share/xine/libxine1/fonts/mono-20.xinefont.gz
share/xine/libxine1/fonts/mono-24.xinefont.gz
share/xine/libxine1/fonts/mono-32.xinefont.gz
share/xine/libxine1/fonts/mono-48.xinefont.gz
share/xine/libxine1/fonts/mono-64.xinefont.gz
share/xine/libxine1/fonts/sans-16.xinefont.gz
share/xine/libxine1/fonts/sans-20.xinefont.gz
share/xine/libxine1/fonts/sans-24.xinefont.gz
share/xine/libxine1/fonts/sans-32.xinefont.gz
share/xine/libxine1/fonts/sans-48.xinefont.gz
share/xine/libxine1/fonts/sans-64.xinefont.gz
share/xine/libxine1/fonts/serif-16.xinefont.gz
share/xine/libxine1/fonts/serif-20.xinefont.gz
share/xine/libxine1/fonts/serif-24.xinefont.gz
share/xine/libxine1/fonts/serif-32.xinefont.gz
share/xine/libxine1/fonts/serif-48.xinefont.gz
share/xine/libxine1/fonts/serif-64.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-24.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-32.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/cc-64.xinefont.gz
%%DATADIR%%/libxine1/fonts/cci-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/cci-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/cci-24.xinefont.gz
%%DATADIR%%/libxine1/fonts/cci-32.xinefont.gz
%%DATADIR%%/libxine1/fonts/cci-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/cci-64.xinefont.gz
%%DATADIR%%/libxine1/fonts/cetus-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/cetus-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/cetus-24.xinefont.gz
%%DATADIR%%/libxine1/fonts/cetus-32.xinefont.gz
%%DATADIR%%/libxine1/fonts/cetus-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/cetus-64.xinefont.gz
%%DATADIR%%/libxine1/fonts/mono-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/mono-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/mono-24.xinefont.gz
%%DATADIR%%/libxine1/fonts/mono-32.xinefont.gz
%%DATADIR%%/libxine1/fonts/mono-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/mono-64.xinefont.gz
%%DATADIR%%/libxine1/fonts/sans-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/sans-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/sans-24.xinefont.gz
%%DATADIR%%/libxine1/fonts/sans-32.xinefont.gz
%%DATADIR%%/libxine1/fonts/sans-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/sans-64.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-16.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-20.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-24.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-32.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz
%%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz
@dirrm include/xine
@dirrm lib/xine/plugins/1.1.1/vidix
@dirrm lib/xine/plugins/1.1.1/post
@ -214,6 +215,6 @@ share/xine/libxine1/fonts/serif-64.xinefont.gz
@dirrm %%DOCSDIR%%
@dirrmtry share/locale/pl_PL/LC_MESSAGES
@dirrmtry share/locale/pl_PL
@dirrm share/xine/libxine1/fonts
@dirrm share/xine/libxine1
@dirrm share/xine
@dirrm %%DATADIR%%/libxine1/fonts
@dirrm %%DATADIR%%/libxine1
@dirrm %%DATADIR%%