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

Update to dvdstyler-3.1.

This commit is contained in:
ajacoutot 2021-02-27 06:58:09 +00:00
parent 3e1badafea
commit 237c984959
10 changed files with 129 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multimedia/dvdstyler/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.45 2019/07/12 20:47:55 sthen Exp $
# $OpenBSD: Makefile,v 1.46 2021/02/27 06:58:09 ajacoutot Exp $
COMMENT= DVD authoring application
DISTNAME= DVDStyler-3.0.4
DISTNAME= DVDStyler-3.1
PKGNAME= ${DISTNAME:L}
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
@ -18,7 +18,7 @@ WANTLIB += c dbus-1 exif fontconfig freetype jpeg m swscale wx_baseu-3.0
WANTLIB += wx_baseu_net-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_media-3.0 wxsvg z
COMPILER = base-clang ports-gcc base-gcc
COMPILER= base-clang ports-gcc base-gcc
BUILD_DEPENDS= archivers/zip \
multimedia/dvdauthor \
@ -36,8 +36,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
LIB_DEPENDS= graphics/ffmpeg \
graphics/libexif \
x11/wxSVG \
x11/wxWidgets>=3.0.4 \
x11/wxWidgets,-media>=3.0.4
x11/wxWidgets,-media
# FIXME: locale/Makefile uses gmake constructs
USE_GMAKE= Yes

4
multimedia/dvdstyler/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (DVDStyler-3.0.4.tar.bz2) = 8Z6p5er2UXt4n0r/wS01FAWT3fhY6gOiQzlVkiwEjFM=
SIZE (DVDStyler-3.0.4.tar.bz2) = 8870498
SHA256 (DVDStyler-3.1.tar.bz2) = dRSdjN4CZHgZHHUwOoqOA/8Q2ty2hsqSqjp97PJO5uc=
SIZE (DVDStyler-3.1.tar.bz2) = 8990074

16
multimedia/dvdstyler/patches/patch-src_Menu_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_Menu_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
Fix build with wxWidgets-gtk3 >=3.1.X
Index: src/Menu.cpp
--- src/Menu.cpp.orig
+++ src/Menu.cpp
@@ -44,7 +44,7 @@ Menu::Menu(DVD* dvd, int tsi, int pgci, VideoFormat vi
Menu::~Menu() {
delete m_svg;
- WX_CLEAR_ARRAY(m_objects)
+ WX_CLEAR_ARRAY(m_objects);
VECTOR_CLEAR(m_actions, DVDAction)
}

16
multimedia/dvdstyler/patches/patch-src_Pgc_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_Pgc_h,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
Fix build with wxWidgets-gtk3 >=3.1.X
Index: src/Pgc.h
--- src/Pgc.h.orig
+++ src/Pgc.h
@@ -21,7 +21,7 @@ class wxProgressDialog;
class Pgc {
public:
Pgc() { }
- ~Pgc() { WX_CLEAR_ARRAY(m_vobs) }
+ ~Pgc() { WX_CLEAR_ARRAY(m_vobs); }
wxString GetEntriesAsString(bool vmgm = false);
StringSet& GetEntries() { return m_entries; }

16
multimedia/dvdstyler/patches/patch-src_TitlePropDlg_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_TitlePropDlg_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
Fix build with wxWidgets-gtk3 >=3.1.X
Index: src/TitlePropDlg.cpp
--- src/TitlePropDlg.cpp.orig
+++ src/TitlePropDlg.cpp
@@ -453,7 +453,7 @@ void TitlePropDlg::OnAddBt(wxCommandEvent& event) {
}
}
-inline int cmpIntRev(_wxArraywxArrayInt* i1, _wxArraywxArrayInt* i2) {
+inline int cmpIntRev(int* i1, int* i2) {
return *i1 < *i2 ? 1 : (*i1 > *i2 ? -1 : 0);
}

16
multimedia/dvdstyler/patches/patch-src_TitlesetManager_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_TitlesetManager_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
Fix build with wxWidgets-gtk3 >=3.1.X
Index: src/TitlesetManager.cpp
--- src/TitlesetManager.cpp.orig
+++ src/TitlesetManager.cpp
@@ -378,7 +378,7 @@ void TitlesetManager::UpdateItems(wxProgressDialog* pr
int selectedMenuId = -1; // to update m_selectedMenu
if (m_selectedMenu>=0 && m_selectedMenu<(int)m_items.Count())
selectedMenuId = m_items[m_selectedMenu]->GetId();
- WX_CLEAR_ARRAY(m_items)
+ WX_CLEAR_ARRAY(m_items);
Menus* menus = &m_dvd->GetVmgm();
for (int pgci = 0; pgci<(int)menus->Count(); pgci++) {
Pgc* pgc = (*menus)[pgci];

18
multimedia/dvdstyler/patches/patch-src_Vob_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_Vob_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
Fix build with wxWidgets-gtk3 >=3.1.X
Index: src/Vob.cpp
--- src/Vob.cpp.orig
+++ src/Vob.cpp
@@ -98,8 +98,8 @@ Vob::~Vob() {
delete m_menu;
if (m_slideshow)
delete m_slideshow;
- WX_CLEAR_ARRAY(m_subtitles)
- WX_CLEAR_ARRAY(m_streams)
+ WX_CLEAR_ARRAY(m_subtitles);
+ WX_CLEAR_ARRAY(m_streams);
VECTOR_CLEAR(m_cells, Cell)
}

14
multimedia/dvdstyler/patches/patch-src_mediaenc_ffmpeg_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_mediaenc_ffmpeg_cpp,v 1.3 2019/02/18 00:27:34 bentley Exp $
Index: src/mediaenc_ffmpeg.cpp
--- src/mediaenc_ffmpeg.cpp.orig
+++ src/mediaenc_ffmpeg.cpp
@@ -223,7 +223,7 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId)
c->time_base = (AVRational){ 1, c->sample_rate };
// some formats want stream headers to be separate
if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
return true;
}

25
multimedia/dvdstyler/patches/patch-wxVillaLib_Thumbnails_cpp Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-wxVillaLib_Thumbnails_cpp,v 1.1 2021/02/27 06:58:09 ajacoutot Exp $
Fix build with wxWidgets-gtk3 >=3.1.X
Index: wxVillaLib/Thumbnails.cpp
--- wxVillaLib/Thumbnails.cpp.orig
+++ wxVillaLib/Thumbnails.cpp
@@ -140,7 +140,7 @@ wxThumbnails::wxThumbnails(wxWindow* parent, int id, l
}
wxThumbnails::~wxThumbnails() {
- WX_CLEAR_ARRAY(m_items)
+ WX_CLEAR_ARRAY(m_items);
}
void wxThumbnails::SetThumbSize(int width, int height, int border) {
@@ -173,7 +173,7 @@ int wxThumbnails::GetThumbImageHeight() {
}
void wxThumbnails::Clear() {
- WX_CLEAR_ARRAY(m_items)
+ WX_CLEAR_ARRAY(m_items);
m_selectedArray.Clear();
wxThumbnailFactory::ClearQueue(this);
UpdateProp();

17
multimedia/dvdstyler/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2019/02/18 00:27:34 bentley Exp $
@comment $OpenBSD: PLIST,v 1.13 2021/02/27 06:58:09 ajacoutot Exp $
@bin bin/dvdstyler
@man man/man1/dvdstyler.1
share/applications/dvdstyler.desktop
@ -72,6 +72,8 @@ share/dvdstyler/buttons/arrow3d-right.xml
share/dvdstyler/buttons/buttons.lst
share/dvdstyler/buttons/cancel.xml
share/dvdstyler/buttons/cancel2.xml
share/dvdstyler/buttons/circle-outline.xml
share/dvdstyler/buttons/circle.xml
share/dvdstyler/buttons/deprecated/
share/dvdstyler/buttons/deprecated/arrow-down.xml
share/dvdstyler/buttons/deprecated/arrow-left.xml
@ -96,16 +98,23 @@ share/dvdstyler/buttons/deprecated/text-v2.xml
share/dvdstyler/buttons/deprecated/text.xml
share/dvdstyler/buttons/ellipse-v2.xml
share/dvdstyler/buttons/ellipse45.xml
share/dvdstyler/buttons/frame-text.xml
share/dvdstyler/buttons/frame-v2.xml
share/dvdstyler/buttons/frame45.xml
share/dvdstyler/buttons/glow_arrow.xml
share/dvdstyler/buttons/hand-left.xml
share/dvdstyler/buttons/hand-right.xml
share/dvdstyler/buttons/home-v2.xml
share/dvdstyler/buttons/movie.xml
share/dvdstyler/buttons/ok.xml
share/dvdstyler/buttons/ok2.xml
share/dvdstyler/buttons/painting_frame.xml
share/dvdstyler/buttons/pill-stroke.xml
share/dvdstyler/buttons/pill.xml
share/dvdstyler/buttons/pill2.xml
share/dvdstyler/buttons/pill3.xml
share/dvdstyler/buttons/settings.xml
share/dvdstyler/buttons/sticky_note.xml
share/dvdstyler/buttons/text-circle-v2.xml
share/dvdstyler/buttons/text-square-v2.xml
share/dvdstyler/buttons/text-underlined-v3.xml
@ -155,6 +164,7 @@ share/dvdstyler/objects/frame45.xml
share/dvdstyler/objects/gold-frame.xml
share/dvdstyler/objects/image.xml
share/dvdstyler/objects/rectangle-v2.xml
share/dvdstyler/objects/sticky_note.xml
share/dvdstyler/objects/text-v2.xml
share/dvdstyler/rc/
share/dvdstyler/rc/add.png
@ -194,6 +204,10 @@ share/dvdstyler/templates/Basic/blue.dvdt
share/dvdstyler/templates/Basic/blue.png
share/dvdstyler/templates/Basic/blueWS.dvdt
share/dvdstyler/templates/Basic/blueWS.png
share/dvdstyler/templates/Basic/frameText.dvdt
share/dvdstyler/templates/Basic/frameText.png
share/dvdstyler/templates/Basic/frameTextWS.dvdt
share/dvdstyler/templates/Basic/frameTextWS.png
share/dvdstyler/templates/Basic/neon.dvdt
share/dvdstyler/templates/Basic/neon.png
share/dvdstyler/templates/Basic/neonWS.dvdt
@ -306,6 +320,7 @@ share/locale/pt/LC_MESSAGES/dvdstyler.mo
share/locale/pt_BR/LC_MESSAGES/dvdstyler.mo
share/locale/ro/LC_MESSAGES/dvdstyler.mo
share/locale/ru/LC_MESSAGES/dvdstyler.mo
share/locale/si/LC_MESSAGES/dvdstyler.mo
share/locale/sk/LC_MESSAGES/dvdstyler.mo
share/locale/sl/LC_MESSAGES/dvdstyler.mo
share/locale/sr/LC_MESSAGES/dvdstyler.mo