summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/avidemux/Makefile4
-rw-r--r--multimedia/avidemux2/Makefile4
-rw-r--r--multimedia/avifile/Makefile4
-rw-r--r--multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm4
-rw-r--r--multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm2
-rw-r--r--multimedia/gstreamer-plugins/Makefile4
-rw-r--r--multimedia/gstreamer-plugins80/Makefile4
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayerxp/Makefile2
-rw-r--r--multimedia/transcode/Makefile8
-rw-r--r--multimedia/vlc-devel/Makefile6
-rw-r--r--multimedia/vlc/Makefile6
-rw-r--r--multimedia/xvid/Makefile2
-rw-r--r--multimedia/xvid/distinfo4
-rw-r--r--multimedia/xvid/pkg-plist2
15 files changed, 31 insertions, 27 deletions
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 41420cf01084..348829409f77 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -45,12 +45,12 @@ IGNORE= requires an x86-32 processor, if you are using other platforms install
WITH_A52= yes
.endif
-.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
WITH_XVID= yes
.endif
.if defined(WITH_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+= --with-xvid-as-decoder
.endif
diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index c71a3daf05c2..b226693953b7 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -45,7 +45,7 @@ WITH_MPEGENC= yes
WITH_A52= yes
.endif
-.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
WITH_XVID= yes
.endif
@@ -54,7 +54,7 @@ RUN_DEPENDS+= mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
.endif
.if defined(WITH_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+= --with-xvid-as-decoder
.endif
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 9ce49f424ce3..ebf634afd6bf 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -65,6 +65,8 @@ PLIST_SUB+= QT="@comment "
.include <bsd.port.pre.mk>
+WITHOUT_XVID=yes # Does not support xvid 1.0.x
+
.if (${ARCH} != "i386") && (${ARCH} != "amd64")
WITHOUT_A52=yes
WITHOUT_XVID=yes
@@ -157,7 +159,7 @@ PLIST_SUB+= VORBIS="@comment "
# xvid
.if !defined(WITHOUT_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+= --with-xvid-prefix=${LOCALBASE}
PLIST_SUB+= XVID=""
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
index c50859602d2e..a4bedda7078d 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
@@ -39,12 +39,12 @@
label => "Default video codec",
type => 'string',
- value => 'divx4',
-+ value => 'xvid2',
++ value => 'xvid4',
presets => [
"SVCD","VCD","XSVCD","XVCD","CVD",
- "divx4","divx5",
- "xvid","xvidcvs","xvid2","xvid3","xvid4",
-+ "xvid2",
++ "xvid4",
"ffmpeg","fame","af6"
],
},
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
index a48ff4091836..032ab99a329a 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
@@ -14,7 +14,7 @@
->set_popdown_strings(
- "divx4","divx5","xvid","xvid2","xvid3",
- "xvid4","ffmpeg","fame","af6"
-+ "xvid2",
++ "xvid4",
+ "ffmpeg","fame","af6"
);
}
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 2b7606b156e3..88ef612e407f 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -339,7 +339,7 @@ WITH_XINE=yes
.endif
# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
WITH_XVID=yes
.endif
@@ -797,7 +797,7 @@ CONFIGURE_ARGS+= --disable-xvid
PLIST_SUB+= XVID="@comment "
#.undef WITH_XVID
#.else
-#LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+#LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
#PLIST_SUB+= XVID=""
#.endif
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 2b7606b156e3..88ef612e407f 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -339,7 +339,7 @@ WITH_XINE=yes
.endif
# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
WITH_XVID=yes
.endif
@@ -797,7 +797,7 @@ CONFIGURE_ARGS+= --disable-xvid
PLIST_SUB+= XVID="@comment "
#.undef WITH_XVID
#.else
-#LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+#LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
#PLIST_SUB+= XVID=""
#.endif
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index d9a2a381ce78..6cc3371a8db5 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -498,7 +498,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/live
.if defined(WITH_XVID)
CONFIGURE_ARGS+= --enable-xvid
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
.endif
.if defined(WITH_LZO)
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index d0650a70cb7d..9c40b1227225 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -153,7 +153,7 @@ CONFIGURE_ARGS+= --disable-sdl-image
.endif
# xvid
.ifdef(WITH_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+= --enable-xvid \
--with-xvidcore=${LOCALBASE}
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 07c4c014977f..bf2ffe8b33d7 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= transcode
PORTVERSION= 0.6.12
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.zebra.fh-weingarten.de/~transcode/pre/
@@ -183,7 +184,8 @@ PLIST_SUB+= WITH_FAME="@comment "
.endif
.if defined(WITH_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
+RUN_DEPENDS+= xvid4conf:${PORTSDIR}/multimedia/xvid4conf
PLIST_SUB+= WITH_XVID=""
WITH_NASM= YES
.else
@@ -361,8 +363,8 @@ post-install:
.if defined(WITH_XVID)
@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \
${PREFIX}/lib/transcode/libxvidcore.so
- @${LN} -sf ${LOCALBASE}/lib/libxvidcore.so.2 \
- ${PREFIX}/lib/transcode/libxvidcore.so.2
+ @${LN} -sf ${LOCALBASE}/lib/libxvidcore.so.4 \
+ ${PREFIX}/lib/transcode/libxvidcore.so.4
.endif
.if defined(WITH_SUBRIP)
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 5d27696c9b6c..284445c92db6 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -144,11 +144,11 @@ WITH_SPEEX= yes
WITH_SVGALIB= yes
.endif
-.if exists(${LOCALBASE}/libxosd.so.4) && !defined(WITHOUT_XOSD)
+.if exists(${LOCALBASE}/lib/libxosd.so.4) && !defined(WITHOUT_XOSD)
WITH_XOSD= yes
.endif
-.if exists(${LOCALBASE}/libxvidcore.so.2) && !defined(WITHOUT_XVID)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.4) && !defined(WITHOUT_XVID)
WITH_XVID= yes
.endif
@@ -290,7 +290,7 @@ CONFIGURE_ARGS+=--enable-xosd
.endif
.if defined(WITH_XVID) && !defined(WITHOUT_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+=--enable-xvideo
PLIST_FILES+= lib/vlc/video_output/libxvideo_plugin.so
.else
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 5d27696c9b6c..284445c92db6 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -144,11 +144,11 @@ WITH_SPEEX= yes
WITH_SVGALIB= yes
.endif
-.if exists(${LOCALBASE}/libxosd.so.4) && !defined(WITHOUT_XOSD)
+.if exists(${LOCALBASE}/lib/libxosd.so.4) && !defined(WITHOUT_XOSD)
WITH_XOSD= yes
.endif
-.if exists(${LOCALBASE}/libxvidcore.so.2) && !defined(WITHOUT_XVID)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.4) && !defined(WITHOUT_XVID)
WITH_XVID= yes
.endif
@@ -290,7 +290,7 @@ CONFIGURE_ARGS+=--enable-xosd
.endif
.if defined(WITH_XVID) && !defined(WITHOUT_XVID)
-LIB_DEPENDS+= xvidcore.2:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
CONFIGURE_ARGS+=--enable-xvideo
PLIST_FILES+= lib/vlc/video_output/libxvideo_plugin.so
.else
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile
index 6c6cf2322066..6a5aad22cc16 100644
--- a/multimedia/xvid/Makefile
+++ b/multimedia/xvid/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xvid
-PORTVERSION= 0.9.2
+PORTVERSION= 1.0.1
PORTEPOCH= 1
CATEGORIES= multimedia
MASTER_SITES= http://files.xvid.org/downloads/
diff --git a/multimedia/xvid/distinfo b/multimedia/xvid/distinfo
index a30389b3214a..da4581c57b47 100644
--- a/multimedia/xvid/distinfo
+++ b/multimedia/xvid/distinfo
@@ -1,2 +1,2 @@
-MD5 (xvidcore-0.9.2.tar.gz) = acccd38c78e155d5fc2337696913feac
-SIZE (xvidcore-0.9.2.tar.gz) = 539344
+MD5 (xvidcore-1.0.1.tar.gz) = 731f3d7b4e3f8f9f87137d2a5e45cb33
+SIZE (xvidcore-1.0.1.tar.gz) = 620119
diff --git a/multimedia/xvid/pkg-plist b/multimedia/xvid/pkg-plist
index cebfd72e2dfc..dfc271b1e300 100644
--- a/multimedia/xvid/pkg-plist
+++ b/multimedia/xvid/pkg-plist
@@ -1,4 +1,4 @@
include/xvid.h
lib/libxvidcore.a
lib/libxvidcore.so
-lib/libxvidcore.so.2
+lib/libxvidcore.so.4
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 01:28:12 +0000