8 files changed, 38 insertions, 142 deletions
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 7b7f27b48af..c12db9c4adc 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2022/03/30 09:21:59 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2022/04/10 16:49:14 nia Exp $
 
-DISTNAME=		xine-ui-0.99.12
-PKGREVISION=		10
+DISTNAME=		xine-ui-0.99.13
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=		.tar.xz
diff --git a/multimedia/xine-ui/PLIST b/multimedia/xine-ui/PLIST
index 260f4e5f044..7e4a29a1dc7 100644
--- a/multimedia/xine-ui/PLIST
+++ b/multimedia/xine-ui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/04/02 15:53:28 nia Exp $
+@comment $NetBSD: PLIST,v 1.17 2022/04/10 16:49:14 nia Exp $
 bin/fbxine
 bin/xine
 bin/xine-bugreport
@@ -52,6 +52,8 @@ share/icons/hicolor/16x16/apps/xine.png
 share/icons/hicolor/22x22/apps/xine.png
 share/icons/hicolor/32x32/apps/xine.png
 share/icons/hicolor/48x48/apps/xine.png
+share/icons/hicolor/64x64/apps/xine.png
+share/icons/hicolor/scalable/apps/xine.svgz
 share/locale/cs/LC_MESSAGES/xine-ui.mo
 share/locale/cs/LC_MESSAGES/xitk.mo
 share/locale/de/LC_MESSAGES/xine-ui.mo
@@ -81,71 +83,30 @@ share/locale/uk/LC_MESSAGES/xine-ui.mo
 share/locale/uk/LC_MESSAGES/xitk.mo
 share/mime/packages/xine-ui.xml
 share/pixmaps/xine.xpm
+share/pixmaps/xine_32.xpm
 share/xine/oxine/mainmenu
 share/xine/oxine/mediamarks
+share/xine/skins/missing.png
 share/xine/skins/xine-ui_logo.mpg
 share/xine/skins/xine-ui_logo.png
+share/xine/skins/xine_64.png
 share/xine/skins/xine_splash.png
-share/xine/skins/xinetic/BigArrowDown.png
-share/xine/skins/xinetic/BigArrowLeft.png
-share/xine/skins/xinetic/BigArrowRight.png
-share/xine/skins/xinetic/BigArrowUp.png
+share/xine/skins/xinetic/ACtlBg.png
 share/xine/skins/xinetic/CtlBg.png
-share/xine/skins/xinetic/CtlBtn.png
-share/xine/skins/xinetic/CtlDismiss.png
-share/xine/skins/xinetic/CtlDummy.png
-share/xine/skins/xinetic/CtlReset.png
-share/xine/skins/xinetic/CtlSave.png
 share/xine/skins/xinetic/Letters.png
 share/xine/skins/xinetic/Letters2.png
-share/xine/skins/xinetic/MainAutoButton.png
+share/xine/skins/xinetic/LettersA.png
+share/xine/skins/xinetic/LettersHLA.png
 share/xine/skins/xinetic/MainBg.png
-share/xine/skins/xinetic/MainCam.png
-share/xine/skins/xinetic/MainClose.png
-share/xine/skins/xinetic/MainDown.png
-share/xine/skins/xinetic/MainEject.png
-share/xine/skins/xinetic/MainFastB.png
-share/xine/skins/xinetic/MainFastF.png
-share/xine/skins/xinetic/MainFullScreen.png
-share/xine/skins/xinetic/MainMute.png
-share/xine/skins/xinetic/MainNav.png
-share/xine/skins/xinetic/MainNext.png
-share/xine/skins/xinetic/MainPause.png
-share/xine/skins/xinetic/MainPlay.png
-share/xine/skins/xinetic/MainPower.png
-share/xine/skins/xinetic/MainPrev.png
-share/xine/skins/xinetic/MainSetup.png
-share/xine/skins/xinetic/MainStop.png
-share/xine/skins/xinetic/MainUp.png
-share/xine/skins/xinetic/MainVolumeBg.png
-share/xine/skins/xinetic/MainVolumePad.png
+share/xine/skins/xinetic/MainBits1.png
+share/xine/skins/xinetic/MainBits2.png
 share/xine/skins/xinetic/MrlBg.png
-share/xine/skins/xinetic/MrlBtn.png
-share/xine/skins/xinetic/MrlDismiss.png
 share/xine/skins/xinetic/MrlFlit.png
-share/xine/skins/xinetic/MrlSelect.png
-share/xine/skins/xinetic/Onglet.png
 share/xine/skins/xinetic/PlBg.png
-share/xine/skins/xinetic/PlBtn.png
-share/xine/skins/xinetic/PlDelete.png
-share/xine/skins/xinetic/PlDeleteAll.png
-share/xine/skins/xinetic/PlDismiss.png
+share/xine/skins/xinetic/PlBits2.png
 share/xine/skins/xinetic/PlInputTxt.png
 share/xine/skins/xinetic/PlItemBtn.png
-share/xine/skins/xinetic/PlMoveDn.png
-share/xine/skins/xinetic/PlMoveUp.png
-share/xine/skins/xinetic/PlPlay.png
-share/xine/skins/xinetic/PlSlidHBg.png
 share/xine/skins/xinetic/SkItemBtn.png
-share/xine/skins/xinetic/SkSlidBG.png
-share/xine/skins/xinetic/SkSlidHBg.png
-share/xine/skins/xinetic/SkSlidHPad.png
-share/xine/skins/xinetic/SlidHPad.png
-share/xine/skins/xinetic/SliderHBg.png
-share/xine/skins/xinetic/SliderHPad.png
-share/xine/skins/xinetic/SliderVBg.png
-share/xine/skins/xinetic/SliderVPad.png
-share/xine/skins/xinetic/SmallArrowDown.png
-share/xine/skins/xinetic/SmallArrowUp.png
 share/xine/skins/xinetic/skinconfig
+share/xine/skins/xinetic/unused.png
 share/xine/visuals/default.mpv
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
index 306a0104567..955f9677e32 100644
--- a/multimedia/xine-ui/distinfo
+++ b/multimedia/xine-ui/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 11:01:20 nia Exp $
+$NetBSD: distinfo,v 1.32 2022/04/10 16:49:14 nia Exp $
 
-BLAKE2s (xine-ui-0.99.12.tar.xz) = 57f18e131b1289800f320834dbca962c38364106d168b0a17bdbe215dd142674
-SHA512 (xine-ui-0.99.12.tar.xz) = bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
-Size (xine-ui-0.99.12.tar.xz) = 1980672 bytes
-SHA1 (patch-ab) = 93cd824f2b85affb8847d84dd8562ef4bb12f6eb
-SHA1 (patch-aj) = 9300e6b992603f9488370d928097eefc65048305
-SHA1 (patch-bb) = e4e1eb142843d78497c66701d433fb24997b867b
-SHA1 (patch-src_xitk_session__common.c) = 7040122ba6351989226584adb2c16a0d9fee31e6
+BLAKE2s (xine-ui-0.99.13.tar.xz) = 416e413865a99c72bc344a55a4a188effe9f1846ee102b6971ffbcf29aec4b50
+SHA512 (xine-ui-0.99.13.tar.xz) = a0802d767a805c462f7ae05fa5c4860af5c281ffa74c70a6c2c8a3ecbf8060e6f3f40fed215e27a823985c7d5c3484715cbbe5e4bf43655353f59fa2230b41e7
+Size (xine-ui-0.99.13.tar.xz) = 2156892 bytes
+SHA1 (patch-src_xitk_network.c) = 1a570e51a731c1ec489566e40e52fbb58896a246
diff --git a/multimedia/xine-ui/patches/patch-ab b/multimedia/xine-ui/patches/patch-ab
deleted file mode 100644
index 7b195795efc..00000000000
--- a/multimedia/xine-ui/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2014/05/07 18:44:28 wiz Exp $
-
-Pass in pthread flags from pkgsrc.
-
---- configure.orig	2012-06-09 18:14:37.000000000 +0000
-+++ configure
-@@ -8371,13 +8371,13 @@ case "$host" in
-     ;;
- 
-   *)
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -8408,7 +8408,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
--  THREAD_LIBS="-lpthread"
-+  THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- else
-   as_fn_error $? "pthread needed" "$LINENO" 5
- fi
diff --git a/multimedia/xine-ui/patches/patch-aj b/multimedia/xine-ui/patches/patch-aj
deleted file mode 100644
index 67deee7209c..00000000000
--- a/multimedia/xine-ui/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.8 2019/05/15 15:37:32 nia Exp $
-
-Fix buffer overflow
-
---- src/xitk/session.c.orig	2017-12-28 16:34:15.000000000 +0000
-+++ src/xitk/session.c
-@@ -487,7 +487,7 @@ int init_session(void) {
-     for(i = 0;; i++)	{
-       saddr.un.sun_family = AF_UNIX;
-       
--      snprintf(saddr.un.sun_path, 108, "%s%s%d", (xine_get_homedir()), "/.xine/session.", i);
-+      snprintf(saddr.un.sun_path, sizeof(saddr.un.sun_path), "%s%s%d", (xine_get_homedir()), "/.xine/session.", i);
-       if(!is_remote_running(i)) {
- 	if((unlink(saddr.un.sun_path) == -1) && errno != ENOENT) {
- 	  fprintf(stderr, "setup_ctrlsocket(): Failed to unlink %s (Error: %s)", 
diff --git a/multimedia/xine-ui/patches/patch-bb b/multimedia/xine-ui/patches/patch-bb
deleted file mode 100644
index b15edc4730d..00000000000
--- a/multimedia/xine-ui/patches/patch-bb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bb,v 1.7 2019/05/15 15:37:32 nia Exp $
-
-Correct readline includes for pkgsrc.
-
---- src/xitk/network.c.orig	2017-12-28 16:34:15.000000000 +0000
-+++ src/xitk/network.c
-@@ -64,8 +64,8 @@
- #include <netdb.h>
- #include <pthread.h>
- 
--#include <readline.h>
--#include <history.h>
-+#include <readline/readline.h>
-+#include <readline/history.h>
- 
- #include "common.h"
- 
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_network.c b/multimedia/xine-ui/patches/patch-src_xitk_network.c
new file mode 100644
index 00000000000..5289ebdf9fc
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-src_xitk_network.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_xitk_network.c,v 1.1 2022/04/10 16:49:15 nia Exp $
+
+Include correct readline headers on NetBSD
+(fails with editline).
+
+--- src/xitk/network.c.orig	2021-12-12 19:49:29.000000000 +0000
++++ src/xitk/network.c
+@@ -63,8 +63,8 @@
+ #include <netdb.h>
+ #include <pthread.h>
+ 
+-#include <readline.h>
+-#include <history.h>
++#include <readline/readline.h>
++#include <readline/history.h>
+ 
+ #include "common.h"
+ #include "network.h"
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_session__common.c b/multimedia/xine-ui/patches/patch-src_xitk_session__common.c
deleted file mode 100644
index 53c7068dbbf..00000000000
--- a/multimedia/xine-ui/patches/patch-src_xitk_session__common.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_xitk_session__common.c,v 1.1 2018/01/21 18:44:59 wiz Exp $
-
-Fix buffer overflow
-
---- src/xitk/session_common.c.orig	2014-02-25 16:52:58.000000000 +0000
-+++ src/xitk/session_common.c
-@@ -61,7 +61,7 @@ int connect_to_session(int session) {
-     euid             = geteuid();
-     setuid(euid);
- 
--    snprintf(saddr.un.sun_path, 108, "%s%s%d", (xine_get_homedir()), "/.xine/session.", session);
-+    snprintf(saddr.un.sun_path, sizeof(saddr.un.sun_path), "%s%s%d", (xine_get_homedir()), "/.xine/session.", session);
-     setreuid(stored_uid, euid);
- 
-     if((connect(fd,&saddr.sa, sizeof(saddr.un))) != -1) {