pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/xine-ui update to xine-ui-0.99.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/94942012570c
branches: trunk
changeset: 475220:94942012570c
user: drochner <drochner%pkgsrc.org@localhost>
date: Wed May 12 16:42:49 2004 +0000
description:
update to xine-ui-0.99.1
changes:
This release is a major update on xine-ui.
It comes with a big cleanup of the user interface, including an improved context
menu, and lots of details of the included "xitk" toolkit.
Additionally, this release fixes some security issues (referenced in XSA-2004-2).
Therefore, we recommend you to upgrade as soon as possible, especially if you are
using xine to play URLs/MRLs you obtained from
also fix some pthread_mutex abuse, and use GNU readline for xine-remote
diffstat:
multimedia/xine-ui/Makefile | 7 +-
multimedia/xine-ui/PLIST | 130 +-----------------------------------
multimedia/xine-ui/distinfo | 10 +-
multimedia/xine-ui/patches/patch-aa | 16 ++--
multimedia/xine-ui/patches/patch-ai | 32 ++++++++
multimedia/xine-ui/patches/patch-aj | 25 ++++++
6 files changed, 78 insertions(+), 142 deletions(-)
diffs (296 lines):
diff -r 9168d800ee22 -r 94942012570c multimedia/xine-ui/Makefile
--- a/multimedia/xine-ui/Makefile Wed May 12 16:37:06 2004 +0000
+++ b/multimedia/xine-ui/Makefile Wed May 12 16:42:49 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/04/18 07:36:34 snj Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/12 16:42:49 drochner Exp $
#
-DISTNAME= xine-ui-0.9.23
-PKGREVISION= 1
+DISTNAME= xine-ui-0.99.1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
@@ -20,9 +19,11 @@
USE_X11= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
+USE_GNU_READLINE= yes
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff -r 9168d800ee22 -r 94942012570c multimedia/xine-ui/PLIST
--- a/multimedia/xine-ui/PLIST Wed May 12 16:37:06 2004 +0000
+++ b/multimedia/xine-ui/PLIST Wed May 12 16:42:49 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/28 21:11:35 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/12 16:42:49 drochner Exp $
bin/aaxine
bin/fbxine
bin/xine
@@ -43,8 +43,8 @@
${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xitk.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xine-ui.mo
${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xitk.mo
-${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/xine-ui.mo
-${PKGLOCALEDIR}/locale/pl_PL/LC_MESSAGES/xitk.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xine-ui.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xitk.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xine-ui.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xitk.mo
${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xine-ui.mo
@@ -57,129 +57,7 @@
share/pixmaps/xine_32x32.png
share/pixmaps/xine_48x48.png
share/xine/desktop/xine.desktop
-share/xine/skins/CelomaChrome/BigArrowDown.png
-share/xine/skins/CelomaChrome/BigArrowLeft.png
-share/xine/skins/CelomaChrome/BigArrowRight.png
-share/xine/skins/CelomaChrome/BigArrowUp.png
-share/xine/skins/CelomaChrome/CtlBg.png
-share/xine/skins/CelomaChrome/CtlBtn.png
-share/xine/skins/CelomaChrome/CtlDismiss.png
-share/xine/skins/CelomaChrome/CtlItemBtn.png
-share/xine/skins/CelomaChrome/FlitArrowDown.png
-share/xine/skins/CelomaChrome/FsBtn.png
-share/xine/skins/CelomaChrome/HideBtn.png
-share/xine/skins/CelomaChrome/LettersBlue.png
-share/xine/skins/CelomaChrome/LettersDigit.png
-share/xine/skins/CelomaChrome/LettersMiddle.png
-share/xine/skins/CelomaChrome/LettersMini.png
-share/xine/skins/CelomaChrome/MainAutoButton.png
-share/xine/skins/CelomaChrome/MainBg.png
-share/xine/skins/CelomaChrome/MainButton.png
-share/xine/skins/CelomaChrome/MainDummy.png
-share/xine/skins/CelomaChrome/MainEject.png
-share/xine/skins/CelomaChrome/MainFastB.png
-share/xine/skins/CelomaChrome/MainFastF.png
-share/xine/skins/CelomaChrome/MainMute.png
-share/xine/skins/CelomaChrome/MainNav.png
-share/xine/skins/CelomaChrome/MainNext.png
-share/xine/skins/CelomaChrome/MainPause.png
-share/xine/skins/CelomaChrome/MainPlay.png
-share/xine/skins/CelomaChrome/MainPower.png
-share/xine/skins/CelomaChrome/MainPrev.png
-share/xine/skins/CelomaChrome/MainStop.png
-share/xine/skins/CelomaChrome/MainVolumeBg.png
-share/xine/skins/CelomaChrome/MainVolumePad.png
-share/xine/skins/CelomaChrome/MrlBg.png
-share/xine/skins/CelomaChrome/MrlBtn.png
-share/xine/skins/CelomaChrome/MrlDismiss.png
-share/xine/skins/CelomaChrome/MrlSelect.png
-share/xine/skins/CelomaChrome/Onglet.png
-share/xine/skins/CelomaChrome/OngletSmall.png
-share/xine/skins/CelomaChrome/PlBg.png
-share/xine/skins/CelomaChrome/PlBtn.png
-share/xine/skins/CelomaChrome/PlDelete.png
-share/xine/skins/CelomaChrome/PlDeleteAll.png
-share/xine/skins/CelomaChrome/PlDismiss.png
-share/xine/skins/CelomaChrome/PlInputTxt.png
-share/xine/skins/CelomaChrome/PlItemBtn.png
-share/xine/skins/CelomaChrome/PlMoveDn.png
-share/xine/skins/CelomaChrome/PlMoveUp.png
-share/xine/skins/CelomaChrome/PlPlay.png
-share/xine/skins/CelomaChrome/PlSlidHBg.png
-share/xine/skins/CelomaChrome/PlSlidHPad.png
-share/xine/skins/CelomaChrome/SetupBtn.png
-share/xine/skins/CelomaChrome/SkItemBtn.png
-share/xine/skins/CelomaChrome/SkSlidBG.png
-share/xine/skins/CelomaChrome/SkSlidHBg.png
-share/xine/skins/CelomaChrome/SkSlidPad.png
-share/xine/skins/CelomaChrome/SliderHBg.png
-share/xine/skins/CelomaChrome/SliderHPad.png
-share/xine/skins/CelomaChrome/SliderVBg.png
-share/xine/skins/CelomaChrome/SliderVPad.png
-share/xine/skins/CelomaChrome/SnapBtn.png
-share/xine/skins/CelomaChrome/skinconfig
share/xine/skins/black.mpv
-share/xine/skins/cloudy/ComBox.png
-share/xine/skins/cloudy/ComDismiss.png
-share/xine/skins/cloudy/ComLetters.png
-share/xine/skins/cloudy/ComScrollArrowDown.png
-share/xine/skins/cloudy/ComScrollArrowLeft.png
-share/xine/skins/cloudy/ComScrollArrowRight.png
-share/xine/skins/cloudy/ComScrollArrowUp.png
-share/xine/skins/cloudy/ComScrollBg.png
-share/xine/skins/cloudy/ComScrollHBg.png
-share/xine/skins/cloudy/ComScrollHPad.png
-share/xine/skins/cloudy/ComScrollPad.png
-share/xine/skins/cloudy/CtlBg.png
-share/xine/skins/cloudy/CtlSkinItem.png
-share/xine/skins/cloudy/CtlSkinScrollBg.png
-share/xine/skins/cloudy/CtlSkinScrollHBg.png
-share/xine/skins/cloudy/CtlSliderBg.png
-share/xine/skins/cloudy/CtlSliderPad.png
-share/xine/skins/cloudy/MainAutoButton.png
-share/xine/skins/cloudy/MainBg.png
-share/xine/skins/cloudy/MainClose.png
-share/xine/skins/cloudy/MainCtlBtn.png
-share/xine/skins/cloudy/MainEject.png
-share/xine/skins/cloudy/MainFullScreen.png
-share/xine/skins/cloudy/MainMrlBtn.png
-share/xine/skins/cloudy/MainMute.png
-share/xine/skins/cloudy/MainNav.png
-share/xine/skins/cloudy/MainNext.png
-share/xine/skins/cloudy/MainPause.png
-share/xine/skins/cloudy/MainPlBtn.png
-share/xine/skins/cloudy/MainPlay.png
-share/xine/skins/cloudy/MainPlayFast.png
-share/xine/skins/cloudy/MainPlaySlow.png
-share/xine/skins/cloudy/MainPower.png
-share/xine/skins/cloudy/MainPrev.png
-share/xine/skins/cloudy/MainSetup.png
-share/xine/skins/cloudy/MainSliderBg.png
-share/xine/skins/cloudy/MainSliderPad.png
-share/xine/skins/cloudy/MainSmallArrowDown.png
-share/xine/skins/cloudy/MainSmallArrowUp.png
-share/xine/skins/cloudy/MainSnapshot.png
-share/xine/skins/cloudy/MainStop.png
-share/xine/skins/cloudy/MainVolumeBg.png
-share/xine/skins/cloudy/MainVolumePad.png
-share/xine/skins/cloudy/MrlBg.png
-share/xine/skins/cloudy/MrlItem.png
-share/xine/skins/cloudy/MrlPlay.png
-share/xine/skins/cloudy/MrlSelect.png
-share/xine/skins/cloudy/MrlSlidHBg.png
-share/xine/skins/cloudy/PlAdd.png
-share/xine/skins/cloudy/PlBg.png
-share/xine/skins/cloudy/PlDelete.png
-share/xine/skins/cloudy/PlDeleteAll.png
-share/xine/skins/cloudy/PlInputText.png
-share/xine/skins/cloudy/PlItem.png
-share/xine/skins/cloudy/PlMoveDown.png
-share/xine/skins/cloudy/PlMoveUp.png
-share/xine/skins/cloudy/PlPlay.png
-share/xine/skins/cloudy/fatsolid.pcf.gz
-share/xine/skins/cloudy/fonts.dir
-share/xine/skins/cloudy/skinconfig
-share/xine/skins/cloudy/smooth.pcf.gz
share/xine/skins/xine-ui_logo.mpv
share/xine/skins/xine_splash.png
share/xine/skins/xinetic/BigArrowDown.png
@@ -247,8 +125,6 @@
share/xine/visuals/default.avi
@dirrm share/xine/visuals
@dirrm share/xine/skins/xinetic
-@dirrm share/xine/skins/cloudy
-@dirrm share/xine/skins/CelomaChrome
@dirrm share/xine/skins
@dirrm share/xine/desktop
@dirrm share/doc/xitk
diff -r 9168d800ee22 -r 94942012570c multimedia/xine-ui/distinfo
--- a/multimedia/xine-ui/distinfo Wed May 12 16:37:06 2004 +0000
+++ b/multimedia/xine-ui/distinfo Wed May 12 16:42:49 2004 +0000
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.2 2004/03/28 21:11:35 mycroft Exp $
+$NetBSD: distinfo,v 1.3 2004/05/12 16:42:49 drochner Exp $
-SHA1 (xine-ui-0.9.23.tar.gz) = 312204db5e41e0018cfb74bdc11ab3aaa26edd5e
-Size (xine-ui-0.9.23.tar.gz) = 2798551 bytes
-SHA1 (patch-aa) = b4cec505c19bc6e05fb886608c35ef9d18db5e9b
+SHA1 (xine-ui-0.99.1.tar.gz) = c803b1d389f742a8e3f02caa8d37149623199245
+Size (xine-ui-0.99.1.tar.gz) = 2339506 bytes
+SHA1 (patch-aa) = e36d7b1d52cf490906f36f2a87fba6192f54b765
SHA1 (patch-ab) = 7f3a44781d0a0418f277c082486e606058fa5357
SHA1 (patch-ac) = 44925827dd883dabb5864ad739ed47a99fd10bda
SHA1 (patch-ad) = 44e69b2a8f087082a4db186eecb8dc562d0fa58f
SHA1 (patch-ae) = 813c897b89edbc1e37b731008b87fe6b04cf53f2
SHA1 (patch-ag) = 4dd810e87922da673dc463367dc231105cfdeb6a
SHA1 (patch-ah) = 9d61282de803459e4b9c49814796dcc97658849d
+SHA1 (patch-ai) = 78228fa174cb0d455a9debec18125d9ee13d34dd
+SHA1 (patch-aj) = 13648ce45993399bb44ac5f275bd0431b1ce0e02
diff -r 9168d800ee22 -r 94942012570c multimedia/xine-ui/patches/patch-aa
--- a/multimedia/xine-ui/patches/patch-aa Wed May 12 16:37:06 2004 +0000
+++ b/multimedia/xine-ui/patches/patch-aa Wed May 12 16:42:49 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2004/03/28 21:11:35 mycroft Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/12 16:42:49 drochner Exp $
---- doc/man/Makefile.in.orig 2003-12-24 14:21:02.000000000 +0000
-+++ doc/man/Makefile.in 2004-03-28 21:04:11.000000000 +0000
-@@ -223,7 +223,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- doc/man/Makefile.in.orig 2004-05-11 23:32:27.000000000 +0200
++++ doc/man/Makefile.in 2004-05-11 23:32:50.000000000 +0200
+@@ -174,7 +174,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
-SUBDIRS = fr es en pl de
+SUBDIRS = en
subdir = doc/man
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff -r 9168d800ee22 -r 94942012570c multimedia/xine-ui/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-ui/patches/patch-ai Wed May 12 16:42:49 2004 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-ai,v 1.1 2004/05/12 16:42:49 drochner Exp $
+
+--- src/xitk/xine-remote.c.orig 2004-05-11 23:39:22.000000000 +0200
++++ src/xitk/xine-remote.c 2004-05-11 23:45:24.000000000 +0200
+@@ -30,6 +30,7 @@
+ #endif
+ /* required for strncasecmp() */
+ #define _BSD_SOURCE 1
++#define _NETBSD_SOURCE
+ /* required to enable POSIX variant of getpwuid_r on solaris */
+ #define _POSIX_PTHREAD_SEMANTICS 1
+
+@@ -58,7 +59,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/signal.h>
++#include <signal.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+@@ -66,8 +67,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 -r 9168d800ee22 -r 94942012570c multimedia/xine-ui/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/xine-ui/patches/patch-aj Wed May 12 16:42:49 2004 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-aj,v 1.1 2004/05/12 16:42:49 drochner Exp $
+
+--- src/xitk/actions.c.orig 2004-05-12 17:57:24.000000000 +0200
++++ src/xitk/actions.c 2004-05-12 18:00:06.000000000 +0200
+@@ -1039,6 +1039,11 @@
+
+ pthread_detach(pthread_self());
+
++ if (pthread_mutex_trylock(&gGui->xe_mutex)) {
++ pthread_exit(NULL);
++ return NULL;
++ }
++
+ if(gGui->logo_mode && (mediamark_get_current_mrl())) {
+ if(!xine_open(gGui->stream, (mediamark_get_current_mrl()))) {
+ gui_handle_xine_error(gGui->stream, (char *)(mediamark_get_current_mrl()));
+@@ -1170,8 +1175,6 @@
+
+ if(gGui->new_pos == -1) {
+
+- pthread_mutex_lock(&gGui->xe_mutex);
+-
+ pthread_mutex_lock(&new_pos_mutex);
+ gGui->new_pos = pos;
+ pthread_mutex_unlock(&new_pos_mutex);
Home |
Main Index |
Thread Index |
Old Index