cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to xine-ui-0.99.13, from adr at sdf.org, tweak from Brad

Browse Source
This commit is contained in:
sthen 2022-02-26 21:25:42 +00:00
parent fee048a6c2
commit 97944a4a9e
6 changed files with 33 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/xine-ui/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.50 2022/02/15 17:21:39 sthen Exp $
# $OpenBSD: Makefile,v 1.51 2022/02/26 21:25:42 sthen Exp $
COMMENT= multimedia player
DISTNAME= xine-ui-0.99.12
REVISION= 2
DISTNAME= xine-ui-0.99.13
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz

4
multimedia/xine-ui/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xine-ui-0.99.12.tar.xz) = VL/EnY5ourqE4WJZUb02NSwKWIMYCJW9lA9VOLSu9YM=
SIZE (xine-ui-0.99.12.tar.xz) = 1980672
SHA256 (xine-ui-0.99.13.tar.xz) = sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU=
SIZE (xine-ui-0.99.13.tar.xz) = 2156892

27
multimedia/xine-ui/patches/patch-src_xitk_network_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_xitk_network_c,v 1.1 2019/12/28 10:08:17 ajacoutot Exp $
Fix some crashes.
Eg, when starting a playlist while already playing something else.
Index: src/xitk/network.c
--- src/xitk/network.c.orig
+++ src/xitk/network.c
@@ -2016,7 +2016,7 @@ static void do_playlist(const commands_t *cmd, client_
if(j >= 0) {
if((gui->playlist.cur == j) && ((xine_get_status(gui->stream) != XINE_STATUS_STOP)))
- gui_stop(NULL, NULL);
+ gui_stop(NULL, gui);
mediamark_free_entry(j);
@@ -2044,7 +2044,7 @@ static void do_playlist(const commands_t *cmd, client_
enable_playback_controls (gui->panel, 0);
if(xine_get_status(gui->stream) != XINE_STATUS_STOP)
- gui_stop(NULL, NULL);
+ gui_stop(NULL, gui);
gui_set_current_mmk(NULL);
}

45
multimedia/xine-ui/patches/patch-src_xitk_playlist_c
View File

@ -1,45 +0,0 @@
$OpenBSD: patch-src_xitk_playlist_c,v 1.1 2019/12/28 10:08:17 ajacoutot Exp $
Fix some crashes.
Eg, when starting a playlist while already playing something else.
Index: src/xitk/playlist.c
--- src/xitk/playlist.c.orig
+++ src/xitk/playlist.c
@@ -260,7 +260,7 @@ void playlist_delete_entry(int j) {
enable_playback_controls (gui->panel, 0);
if(xine_get_status(gui->stream) != XINE_STATUS_STOP)
- gui_stop(NULL, NULL);
+ gui_stop(NULL, gui);
gui_set_current_mmk(NULL);
xitk_inputtext_change_text(playlist->winput, NULL);
@@ -294,7 +294,7 @@ void playlist_delete_all(xitk_widget_t *w, void *data)
playlist_update_playlist();
if(xine_get_status(gui->stream) != XINE_STATUS_STOP)
- gui_stop(NULL, NULL);
+ gui_stop(NULL, gui);
if(playlist && playlist->winput)
xitk_inputtext_change_text(playlist->winput, NULL);
@@ -375,7 +375,7 @@ static void _playlist_load_callback(filebrowser_t *fb)
playlist_update_playlist();
if((xine_get_status(gui->stream) == XINE_STATUS_PLAY))
- gui_stop(NULL, NULL);
+ gui_stop(NULL, gui);
if ((!is_playback_widgets_enabled (gui->panel)) && gui->playlist.num)
enable_playback_controls (gui->panel, 1);
@@ -829,7 +829,7 @@ void playlist_scan_input(xitk_widget_t *w, void *ip) {
*/
if (gui->smart_mode) {
if (xine_get_status (gui->stream) == XINE_STATUS_PLAY)
- gui_stop (NULL, NULL);
+ gui_stop (NULL, gui);
gui_play (NULL, gui);
}

16
multimedia/xine-ui/patches/patch-src_xitk_xine-toolkit_backend_x11_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_xitk_xine-toolkit_backend_x11_c,v 1.1 2022/02/26 21:25:42 sthen Exp $
Remove malloc.h include
3ea5f5a563782e4f2f5230e9d8e3a658229536a4
Index: src/xitk/xine-toolkit/backend_x11.c
--- src/xitk/xine-toolkit/backend_x11.c.orig
+++ src/xitk/xine-toolkit/backend_x11.c
@@ -30,7 +30,6 @@
#include <strings.h>
#include <unistd.h>
#include <pthread.h>
-#include <malloc.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>

65
multimedia/xine-ui/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2019/12/24 15:05:43 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.14 2022/02/26 21:25:42 sthen Exp $
@comment bin/fbxine
@bin bin/xine
bin/xine-bugreport
@ -62,6 +62,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
@ -92,77 +94,36 @@ share/locale/uk/LC_MESSAGES/xitk.mo
share/mime/packages/xine-ui.xml
share/pixmaps/
share/pixmaps/xine.xpm
share/pixmaps/xine_32.xpm
share/xine/
share/xine/oxine/
share/xine/oxine/mainmenu
share/xine/oxine/mediamarks
share/xine/skins/
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/
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/
share/xine/visuals/default.mpv
@tag update-mime-database