Re: wxGTK28 vs. wxGTK30

[Chavdar Ivanov <ci4ic4%gmail.com@localhost>]

On Mon, 25 Nov 2019 at 22:42, Chavdar Ivanov <ci4ic4%gmail.com@localhost> wrote:
>
> On Mon, 25 Nov 2019 at 16:08, Thomas Klausner <tk%giga.or.at@localhost> wrote:
> >
> > On Mon, Nov 25, 2019 at 03:15:26PM +0000, Chavdar Ivanov wrote:
> > > Hi,
> > >
> > > wxmaxima now uses wxGTK30, however, if one has wxGTK28 installed in
> > > the build host, cmake makes a mess of it including bits from wxGTK28.
> > > I tried to patch the initial CMake file to have wxGTK30 as the minimum
> > > version accepted, it did not make a difference, the bits from wxGTK28
> > > were still included.
> > >
> > > The problem goes away if one uninstalls wxGTK28 from the build host,
> > > then wxmaxima builds right away.
> > >
> > > On my build host the only reason I had wxGTK28 installed was
> > > graphics/wxsvg package, which builds correctly if one replaces the
> > > include in the Makefile:
> > > ...
> > > -.include "../../x11/wxGTK28/buildlink3.mk"
> > > +.include "../../x11/wxGTK30/buildlink3.mk"
> > > ...
> >
> > Then probably multimedia/dvdstyler, the only consumer of the library,
> > will break, since it still depends on wxGTK28.
> >
> > There is a newer version out (3.1), care to update to it and switch it
> > to wxGTK30? I guess that's the reason you have wxSVG installed.
>
> The reason I've got wxsvg installed has been irretrivably lost in the
> past... I haven't used dvdstyler as well, but decided to see if it is
> not too hard to sort out.
>
> It turned out it needs newer version of wxsvg than we have (it needs
> at least 1.5.12, we have 1.5.3). I tried the latest - 1.5.20;
> initially had some problem with libexif, which I sorted out somehow
> (created the missing links in the .buildlink directry....), but later
> I stuck a problem with ffmpeg:
> ....
> libtool: compile:  c++ -DPACKAGE_NAME=\"wxsvg\"
> -DPACKAGE_TARNAME=\"wxsvg\" -DPACKAGE_VERSION=\"1.5.20\"
> "-DPACKAGE_STRING=\"wxsvg 1.5.20\"" -DPACKAGE_B
> UGREPORT=\"http://wxsvg.sourceforge.net/\"; -DPACKAGE_URL=\"\"
> -DPACKAGE=\"wxsvg\" -DVERSION=\"1.5.20\" -DSTDC_HEADERS=1
> -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_
> STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1
> -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1
> -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H
> =1 -DLT_OBJDIR=\".libs/\" -I. -I../include -I../include/wxSVG
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include
> -I/usr/pkgsrc/graphics/wxsvg/work/.bu
> ildlink/include/freetype2
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include/ffmpeg1
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include/wx-3.0 -I/us
> r/pkgsrc/graphics/wxsvg/work/.x11-buildlink/include
> -I/usr/pkgsrc/graphics/wxsvg/work/.x11-buildlink/include/libdrm
> -I/usr/pkgsrc/graphics/wxsvg/work/.b
> uildlink/include/glib-2.0
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include/gio-unix-2.0
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/lib/glib-2.0/in
> clude -O2 -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include/cairo
> -I/usr/pkgsrc/graphics/wxsvg/work/.x11-buildlink/include/pixman-1
> -I/usr/pkgsrc/gra
> phics/wxsvg/work/.buildlink/include/uuid
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include/libpng16
> -D_REENTRANT -DUSE_RENDER_CAIRO -I/usr/pkgsrc/gra
> phics/wxsvg/work/.buildlink/include/pango-1.0
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/include/harfbuzz
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink
> /include/fribidi -D_REENTRANT
> -I/usr/pkgsrc/graphics/wxsvg/work/.buildlink/lib/wx/include/gtk3-unicode-3.0
> -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK
> __ -pthread -DUSE_LIBAV -MT mediadec_ffmpeg.lo -MD -MP -MF
> .deps/mediadec_ffmpeg.Tpo -c mediadec_ffmpeg.cpp  -fPIC -DPIC -o
> .libs/mediadec_ffmpeg.o
> mediadec_ffmpeg.cpp: In member function 'virtual float
> wxFfmpegMediaDecoder::GetFrameAspectRatio()':
> mediadec_ffmpeg.cpp:116:2: error: 'AVCodecParameters' was not declared
> in this scope
>   AVCodecParameters *enc = st->codecpar;
>   ^~~~~~~~~~~~~~~~~
> mediadec_ffmpeg.cpp:116:2: note: suggested alternative: 'AVCodecParser'
>   AVCodecParameters *enc = st->codecpar;
>   ^~~~~~~~~~~~~~~~~
>   AVCodecParser
> mediadec_ffmpeg.cpp:116:21: error: 'enc' was not declared in this scope
>   AVCodecParameters *enc = st->codecpar;
>                      ^~~
>
> ....
>
> which is beyond me....

I was too quick here - 1.5.20 builds fine as long as ffmpeg1 is
replaced with ffmpeg3 and librsvg is added, the patch follows:
......
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/wxsvg/Makefile,v
retrieving revision 1.64
diff -u -r1.64 Makefile
--- Makefile 21 Jul 2019 22:24:07 -0000 1.64
+++ Makefile 25 Nov 2019 23:01:16 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.64 2019/07/21 22:24:07 wiz Exp $

-DISTNAME= wxsvg-1.5.3
-PKGREVISION= 14
+DISTNAME= wxsvg-1.5.20
 CATEGORIES= graphics
 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/}
 EXTRACT_SUFX= .tar.bz2
@@ -18,7 +17,8 @@

 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/wxsvg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- PLIST 1 Mar 2015 12:17:57 -0000 1.7
+++ PLIST 25 Nov 2019 23:01:16 -0000
@@ -188,5 +188,8 @@
 include/wxSVG/svgctrl.h
 include/wxSVGXML/svgxml.h
 include/wxSVGXML/svgxmlhelpr.h
+include/wxSVG/CSSRule.h
+include/wxSVG/ExifHandler.h
+include/wxSVG/UIEvent.h
 lib/libwxsvg.la
 lib/pkgconfig/libwxsvg.pc
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/wxsvg/buildlink3.mk,v
retrieving revision 1.43
diff -u -r1.43 buildlink3.mk
--- buildlink3.mk 21 Jul 2019 22:24:07 -0000 1.43
+++ buildlink3.mk 25 Nov 2019 23:01:16 -0000
@@ -11,7 +11,7 @@

 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .endif # WXSVG_BUILDLINK3_MK

 BUILDLINK_TREE+= -wxsvg
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/wxsvg/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 3 Nov 2015 21:34:35 -0000 1.15
+++ distinfo 25 Nov 2019 23:01:16 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.15 2015/11/03 21:34:35 agc Exp $

-SHA1 (wxsvg-1.5.3.tar.bz2) = 84640a696e2c03587a1562e214d76e3046ebae06
-RMD160 (wxsvg-1.5.3.tar.bz2) = 5997df257765a29a4f360ee78b1eec0900e537da
-SHA512 (wxsvg-1.5.3.tar.bz2) =
a8bb22e1688b58a431beffb71064f760f6f004abb81b2a4f48a2c59605020c7e2c6c03bc68f880cca60e9fb154f364b96849f04e32b48d1185b17f9304dcf295
-Size (wxsvg-1.5.3.tar.bz2) = 466539 bytes
+SHA1 (wxsvg-1.5.20.tar.bz2) = a9de15b299523cfc6166cf647e7ac6b87b3d4d98
+RMD160 (wxsvg-1.5.20.tar.bz2) = 47b265e44ddeee41b29006ae7bca0073e11f757b
+SHA512 (wxsvg-1.5.20.tar.bz2) =
423cfc5c24133fe1bc6db3253999262d17eac91ea1d6c62dad39cbf49e1c469dc503fc7a3bcac367eaf622777d9be0ecae5e28723f84fd564a630d3f90308929
+Size (wxsvg-1.5.20.tar.bz2) = 495401 bytes
......


wxsvg 1.5.20 now builds; I am now trying to build dvdstyler.

Well, the following almost does it - with the exception of two files
which refer to a missing entry from wxsvg - ExifHandler - which I
shunted, obviously not quite the right thing to do, but the build
completes.

The patch follows:
......
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/dvdstyler/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- Makefile 21 Jul 2019 22:25:25 -0000 1.78
+++ Makefile 25 Nov 2019 23:25:39 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.78 2019/07/21 22:25:25 wiz Exp $

-DISTNAME= DVDStyler-2.7.1
-PKGREVISION= 19
+DISTNAME= DVDStyler-3.1
 CATEGORIES= multimedia
 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX= .tar.bz2
@@ -27,7 +26,7 @@
 USE_TOOLS+= gmake lex pkg-config msgfmt zip
 GNU_CONFIGURE= yes
 LDFLAGS+= -ljpeg
-CONFIGURE_ARGS+= FFMPEG_PATH=${BUILDLINK_PREFIX.ffmpeg1}/bin/ffmpeg1
+CONFIGURE_ARGS+= FFMPEG_PATH=${BUILDLINK_PREFIX.ffmpeg3}/bin/ffmpeg3

 post-install:
  cd ${WRKSRC}/templates && ${SETENV} ${INSTALL_ENV} ${GMAKE} install
@@ -35,9 +34,9 @@
 .include "../../graphics/libexif/buildlink3.mk"
 BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.1.14
 .include "../../graphics/wxsvg/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 # needs mediactrl
-BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10nb14
-.include "../../x11/wxGTK28/buildlink3.mk"
+####BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10nb14
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/dvdstyler/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- PLIST 31 Mar 2014 23:28:39 -0000 1.14
+++ PLIST 25 Nov 2019 23:25:39 -0000
@@ -175,6 +175,106 @@
 share/dvdstyler/transitions/wipeLeftToRight.xml
 share/dvdstyler/transitions/wipeRightToLeft.xml
 share/dvdstyler/transitions/wipeTopToBottom.xml
+share/dvdstyler/backgrounds/Autumn1.png
+share/dvdstyler/backgrounds/Autumn2.png
+share/dvdstyler/backgrounds/Balloons.png
+share/dvdstyler/backgrounds/Cake.jpg
+share/dvdstyler/backgrounds/Camera.jpg
+share/dvdstyler/backgrounds/Christmas_L1.png
+share/dvdstyler/backgrounds/Christmas_L6.png
+share/dvdstyler/backgrounds/Fireworks.jpg
+share/dvdstyler/backgrounds/Heart.jpg
+share/dvdstyler/backgrounds/Landscape.png
+share/dvdstyler/backgrounds/MothersDay.jpg
+share/dvdstyler/backgrounds/SnowField.png
+share/dvdstyler/backgrounds/Sun.png
+share/dvdstyler/backgrounds/Winter.png
+share/dvdstyler/backgrounds/penguin.png
+share/dvdstyler/buttons/circle-outline.xml
+share/dvdstyler/buttons/circle.xml
+share/dvdstyler/buttons/frame-text.xml
+share/dvdstyler/buttons/glow_arrow.xml
+share/dvdstyler/buttons/movie.xml
+share/dvdstyler/buttons/painting_frame.xml
+share/dvdstyler/buttons/pill-stroke.xml
+share/dvdstyler/buttons/settings.xml
+share/dvdstyler/buttons/sticky_note.xml
+share/dvdstyler/data/colors16.rgb
+share/dvdstyler/docs/help_el.zip
+share/dvdstyler/docs/help_es.zip
+share/dvdstyler/docs/help_eu.zip
+share/dvdstyler/docs/help_si.zip
+share/dvdstyler/objects/gold-frame.xml
+share/dvdstyler/objects/sticky_note.xml
+share/dvdstyler/rc/addVideo.png
+share/dvdstyler/rc/dvdOptions.png
+share/dvdstyler/rc/error.png
+share/dvdstyler/rc/ok.png
+share/dvdstyler/rc/refresh.png
+share/dvdstyler/rc/rotate.cur
+share/dvdstyler/rc/settings.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/Birthday/Balloons.dvdt
+share/dvdstyler/templates/Birthday/Balloons.png
+share/dvdstyler/templates/Birthday/BalloonsWS.dvdt
+share/dvdstyler/templates/Birthday/BalloonsWS.png
+share/dvdstyler/templates/Birthday/Cake.dvdt
+share/dvdstyler/templates/Birthday/Cake.png
+share/dvdstyler/templates/Birthday/CakeWS.dvdt
+share/dvdstyler/templates/Birthday/CakeWS.png
+share/dvdstyler/templates/Christmas/ChristmasL1.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL1.png
+share/dvdstyler/templates/Christmas/ChristmasL1WS.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL1WS.png
+share/dvdstyler/templates/Christmas/ChristmasL6.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL6.png
+share/dvdstyler/templates/Christmas/ChristmasL6WS.dvdt
+share/dvdstyler/templates/Christmas/ChristmasL6WS.png
+share/dvdstyler/templates/Christmas/Fireworks.dvdt
+share/dvdstyler/templates/Christmas/Fireworks.png
+share/dvdstyler/templates/Christmas/FireworksWS.dvdt
+share/dvdstyler/templates/Christmas/FireworksWS.png
+share/dvdstyler/templates/Miscellaneous/BlueFractal.dvdt
+share/dvdstyler/templates/Miscellaneous/BlueFractal.png
+share/dvdstyler/templates/Miscellaneous/Penguin.dvdt
+share/dvdstyler/templates/Miscellaneous/Penguin.png
+share/dvdstyler/templates/Miscellaneous/RedSky.dvdt
+share/dvdstyler/templates/Miscellaneous/RedSky.png
+share/dvdstyler/templates/Nature/BlueTreetops.dvdt
+share/dvdstyler/templates/Nature/BlueTreetops.png
+share/dvdstyler/templates/Nature/FrostyForest.dvdt
+share/dvdstyler/templates/Nature/FrostyForest.png
+share/dvdstyler/templates/Nature/GreenTrees.dvdt
+share/dvdstyler/templates/Nature/GreenTrees.png
+share/dvdstyler/templates/Seasons/Autumn.dvdt
+share/dvdstyler/templates/Seasons/Autumn.png
+share/dvdstyler/templates/Seasons/Autumn2.dvdt
+share/dvdstyler/templates/Seasons/Autumn2.png
+share/dvdstyler/templates/Seasons/AutumnWS.dvdt
+share/dvdstyler/templates/Seasons/AutumnWS.png
+share/dvdstyler/templates/Seasons/Landscape.dvdt
+share/dvdstyler/templates/Seasons/Landscape.png
+share/dvdstyler/templates/Seasons/LandscapeWS.dvdt
+share/dvdstyler/templates/Seasons/LandscapeWS.png
+share/dvdstyler/templates/Seasons/SnowField.dvdt
+share/dvdstyler/templates/Seasons/SnowField.png
+share/dvdstyler/templates/Seasons/SnowFieldWS.dvdt
+share/dvdstyler/templates/Seasons/SnowFieldWS.png
+share/dvdstyler/templates/Seasons/Sun.dvdt
+share/dvdstyler/templates/Seasons/Sun.png
+share/dvdstyler/templates/Seasons/Winter.dvdt
+share/dvdstyler/templates/Seasons/Winter.png
+share/dvdstyler/templates/Travel/Camera.dvdt
+share/dvdstyler/templates/Travel/Camera.png
+share/dvdstyler/templates/Travel/CameraWS.dvdt
+share/dvdstyler/templates/Travel/CameraWS.png
+share/dvdstyler/templates/Wedding/DarkWedding.dvdt
+share/dvdstyler/templates/Wedding/DarkWedding.png
+share/locale/bg/LC_MESSAGES/dvdstyler.mo
+share/locale/si/LC_MESSAGES/dvdstyler.mo
 share/locale/ar/LC_MESSAGES/dvdstyler.mo
 share/locale/ca/LC_MESSAGES/dvdstyler.mo
 share/locale/cs/LC_MESSAGES/dvdstyler.mo
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/dvdstyler/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo 3 Nov 2015 23:54:23 -0000 1.17
+++ distinfo 25 Nov 2019 23:25:39 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.17 2015/11/03 23:54:23 agc Exp $

-SHA1 (DVDStyler-2.7.1.tar.bz2) = e8bd2510dd7cee09a48ecfac19842a20a1232f61
-RMD160 (DVDStyler-2.7.1.tar.bz2) = 38eaa277818b67b3c79ec7e379c6b1284a73b9bb
-SHA512 (DVDStyler-2.7.1.tar.bz2) =
d76c176d45c3c92df86464eaf6c6847945822effbc33a25123896d0623a14e666c19a214d3038c290bdc1bfc935b40ededd5b689ec77b3c4cc01bb431be215e3
-Size (DVDStyler-2.7.1.tar.bz2) = 5816255 bytes
+SHA1 (DVDStyler-3.1.tar.bz2) = eddae0b413c451f23a55d68b5799d893ed7bcd00
+RMD160 (DVDStyler-3.1.tar.bz2) = 765b21bf2544b4dba739982e91945557ed568613
+SHA512 (DVDStyler-3.1.tar.bz2) =
3cae65480eba490bc945d9862f1c86f32fb01e14c6e773b0c707ad3257f84eb56d155bcde84c84729c6cd038e02355b679d7a4fd9db448ccb02e6a96fb6e123c
+Size (DVDStyler-3.1.tar.bz2) = 8990074 bytes
 SHA1 (patch-aa) = 2629351931c11d2a3bf910fc7a3eed34486528a4
 SHA1 (patch-locale_Makefile.in) = 5d5a4c6cd0baa197cabf3c630497fc8396a009ef



>
> ....
>
> >  Thomas
>
>
>
> --
> ----



-- 
----