From 056d16ee00b058192a7de52e17f1709cd35c485e Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sun, 7 Jan 2024 22:18:28 +0100 Subject: [PATCH] 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 (cherry picked from commit ee62c0523858b3a89a825ba9ae0da3d9555321c1) --- multimedia/mencoder/distinfo | 6 +++--- multimedia/mplayer/Makefile | 2 -- multimedia/mplayer/Makefile.common | 2 +- multimedia/mplayer/distinfo | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo index e305c7474aa61..15aca8be4a8e2 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 d739a76c0a38e..b9f76117f763b 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 710c9c1359f34..4c0db86b42643 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 b34e2e34db55b..59fa230354575 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