aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2024-01-07 21:18:28 +0000
committerThomas Zander <riggs@FreeBSD.org>2024-01-08 07:45:38 +0000
commitee62c0523858b3a89a825ba9ae0da3d9555321c1 (patch)
treeacc354397ec4e1780f721baf966c53762bb7c7fa
parentc1bf4b463e1a57ed39db34d914fd32b10cb1fb4a (diff)
downloadports-ee62c0523858b3a89a825ba9ae0da3d9555321c1.tar.gz
ports-ee62c0523858b3a89a825ba9ae0da3d9555321c1.zip
multimedia/{mplayer|mencoder} Update to newer upstream snapshot
Details: - Update to upstream snapshot as of 2024-01-06 - No major functional changes, but adds detection for new CPU instructions MFH: 2024Q1
-rw-r--r--multimedia/mencoder/distinfo6
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayer/Makefile.common2
-rw-r--r--multimedia/mplayer/distinfo6
4 files changed, 7 insertions, 9 deletions
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index e305c7474aa6..15aca8be4a8e 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695563059
-SHA256 (mplayer-1.5.0.20230924.tar.xz) = a8f6c0113abfb0b392932974247bfd6fd6dc2287ca22948a18ee3809f8b4ead5
-SIZE (mplayer-1.5.0.20230924.tar.xz) = 5197076
+TIMESTAMP = 1704536551
+SHA256 (mplayer-1.5.0.20240106.tar.xz) = c72f8c2e2a8829e49cadca8ed3f2454b70afd39b155bed734df603498b4ed5e5
+SIZE (mplayer-1.5.0.20240106.tar.xz) = 5191136
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index d739a76c0a38..b9f76117f763 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -38,8 +38,6 @@ X11VM_DESC?= X11 VidMode support
SUB_FILES= pkg-message
-CONFLICTS= mplayer2-2.*
-
CONFFILES= example.conf input.conf menu.conf dvb-menu.conf
USES+= iconv pkgconfig
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 710c9c1359f3..4c0db86b4264 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -3,7 +3,7 @@
# before we include bsd.port.pre.mk
MPLAYER_PORT_VERSION= 1.5.0
-MPLAYER_SNAPSHOT_DATE= 2023-09-24
+MPLAYER_SNAPSHOT_DATE= 2024-01-06
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index b34e2e34db55..59fa23035457 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695561365
-SHA256 (mplayer-1.5.0.20230924.tar.xz) = a8f6c0113abfb0b392932974247bfd6fd6dc2287ca22948a18ee3809f8b4ead5
-SIZE (mplayer-1.5.0.20230924.tar.xz) = 5197076
+TIMESTAMP = 1704534638
+SHA256 (mplayer-1.5.0.20240106.tar.xz) = c72f8c2e2a8829e49cadca8ed3f2454b70afd39b155bed734df603498b4ed5e5
+SIZE (mplayer-1.5.0.20240106.tar.xz) = 5191136