aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/crystalspace-devel/Makefile1
-rw-r--r--graphics/crystalspace/Makefile2
-rw-r--r--graphics/gstreamer-plugins-libcaca/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile11
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/toxine/Makefile3
-rw-r--r--multimedia/toxine/files/patch-src__plugins__vo_caca.c12
-rw-r--r--multimedia/vlc-devel/Makefile17
10 files changed, 22 insertions, 32 deletions
diff --git a/graphics/crystalspace-devel/Makefile b/graphics/crystalspace-devel/Makefile
index fdd1bb73a187..7a2c0a143fd8 100644
--- a/graphics/crystalspace-devel/Makefile
+++ b/graphics/crystalspace-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= crystalspace
PORTVERSION= 20061105
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://alex.foxybanana.com/freebsd/
PKGNAMESUFFIX= -devel
diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile
index b18adae77157..399ad7c3c0a5 100644
--- a/graphics/crystalspace/Makefile
+++ b/graphics/crystalspace/Makefile
@@ -7,7 +7,7 @@
PORTNAME= crystalspace
PORTVERSION= 0.99
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= crystal
diff --git a/graphics/gstreamer-plugins-libcaca/Makefile b/graphics/gstreamer-plugins-libcaca/Makefile
index 8c48a053830a..55edf6c827c3 100644
--- a/graphics/gstreamer-plugins-libcaca/Makefile
+++ b/graphics/gstreamer-plugins-libcaca/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= Gstreamer color ascii art plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 8940cddc1129..4d7cccfe666f 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -74,9 +74,6 @@ PLIST_SUB+= VERSION="${VERSION}" \
USE_GSTREAMER= yes
.endif
-.if ${OSVERSION} < 500000
-IGNORE= many plugins don't build or even work on 4.x
-.endif
.include "${MASTERDIR}/Makefile.common"
.if ${DIST}=="base"
@@ -111,22 +108,14 @@ DISTFILES+= ${GOOD_DISTFILE}:good
.ifdef(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
.else
-. if ${OSVERSION} < 500000
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-. else
DEFAULT_CDROM_DEVICE=/dev/acd0
-. endif
.endif
# dvd default device
.ifdef(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
-. if ${OSVERSION} < 500000
-DEFAULT_DVD_DEVICE=/dev/acd0c
-. else
DEFAULT_DVD_DEVICE=/dev/acd0
-. endif
.endif
post-patch:
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index bc41bbed6f6c..4c4241ab0102 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -231,7 +231,7 @@ gst_lame_LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
gst_lame_DIST= ugly
# libcaca
-gst_libcaca_BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+gst_libcaca_LIB_DEPENDS+= caca.0:${PORTSDIR}/graphics/libcaca
gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so \
${GST_LIB_DIR}/libgstcacasink.a \
${GST_LIB_DIR}/libgstcacasink.la
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 85ab1b4d2814..ac26fed3c363 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 1.1.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 6fe67c41def2..31cf6df64caf 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -83,7 +83,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
diff --git a/multimedia/toxine/Makefile b/multimedia/toxine/Makefile
index b1e2c2a72cec..7abc60da3147 100644
--- a/multimedia/toxine/Makefile
+++ b/multimedia/toxine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= toxine
PORTVERSION= 0.6.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= toxine
@@ -44,6 +44,7 @@ PLIST_SUB+= AALIB="@comment "
.if !defined(WITHOUT_LIBCACA)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+CONFIGURE_ARGS+=--disable-cacatest
PLIST_SUB+= LIBCACA=""
.else
PLIST_SUB+= LIBCACA="@comment "
diff --git a/multimedia/toxine/files/patch-src__plugins__vo_caca.c b/multimedia/toxine/files/patch-src__plugins__vo_caca.c
new file mode 100644
index 000000000000..4fd252d1e3c9
--- /dev/null
+++ b/multimedia/toxine/files/patch-src__plugins__vo_caca.c
@@ -0,0 +1,12 @@
+--- ./src/plugins/vo_caca.c.orig Thu May 6 18:16:03 2004
++++ ./src/plugins/vo_caca.c Sun Apr 15 16:26:25 2007
+@@ -27,6 +27,9 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index e8954d687362..41718ee42b9e 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,6 +10,7 @@
PORTNAME= vlc
DISTVERSION= 0.8.6b
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
@@ -141,12 +142,8 @@ CONFIGURE_ARGS+=--disable-nls
.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
-.if ${OSVERSION} < 500000
-DEFAULT_DVD_DEVICE=/dev/acd0c
-.else
DEFAULT_DVD_DEVICE=/dev/acd0
.endif
-.endif
.if !defined(WITHOUT_GNOMEVFS)
USE_GNOME+= gnomevfs2
@@ -158,12 +155,8 @@ CONFIGURE_ARGS+= --disable-gnomevfs
.if defined(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
.else
-.if ${OSVERSION} < 500000
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-.else
DEFAULT_CDROM_DEVICE=/dev/acd0
.endif
-.endif
.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar
@@ -318,9 +311,7 @@ CONFIGURE_ARGS+=--disable-x264
.if (defined(WITH_CACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_CACA)
.if !defined(WITHOUT_AALIB)
WITH_AALIB= yes
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-RUN_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-
+LIB_DEPENDS+= caca.0:${PORTSDIR}/graphics/libcaca
CONFIGURE_ARGS+=--enable-caca
.endif
.else
@@ -556,9 +547,5 @@ CONFIGURE_ARGS+=--enable-release \
CONFIGURE_ARGS+=--enable-release
.endif
-.if ${OSVERSION} < 500000
-CONFIGURE_ENV+= LIBS="-L/usr/lib -lcipher"
-.endif
-
.include "${.CURDIR}/Makefile.inc"
.include <bsd.port.post.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 06:42:12 +0000