From d35459750502e9b75161b5b9aeb3da0e125cce07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 21 Aug 2019 01:57:45 +0200 Subject: [PATCH] vice: upgrade 3.2 -> 3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now they prefer GTK3 Signed-off-by: Andreas Müller --- ...Do-not-check-if-ar-suppurts-u-option.patch | 50 +++++++++ .../0002-Hack-build-with-latest-FFMPEG.patch | 101 ------------------ .../vice/files/0003-Set-fixed-VICEDIR.patch | 30 ------ .../vice/{vice_3.2.bb => vice_3.3.bb} | 23 +--- 4 files changed, 55 insertions(+), 149 deletions(-) create mode 100644 recipes-emulators/vice/files/0002-Do-not-check-if-ar-suppurts-u-option.patch delete mode 100644 recipes-emulators/vice/files/0002-Hack-build-with-latest-FFMPEG.patch delete mode 100644 recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch rename recipes-emulators/vice/{vice_3.2.bb => vice_3.3.bb} (61%) diff --git a/recipes-emulators/vice/files/0002-Do-not-check-if-ar-suppurts-u-option.patch b/recipes-emulators/vice/files/0002-Do-not-check-if-ar-suppurts-u-option.patch new file mode 100644 index 0000000..8d9a5ef --- /dev/null +++ b/recipes-emulators/vice/files/0002-Do-not-check-if-ar-suppurts-u-option.patch @@ -0,0 +1,50 @@ +From e65294ee2a7890e7a224db38a98ea20ccc412391 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 21 Aug 2019 01:26:42 +0200 +Subject: [PATCH] Do not check if ar suppurts '-u' option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +wrap-u-ar.sh does not semm necessary and it does notwork for us in first place + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.ac | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3d51636..c36fc5c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1238,25 +1238,6 @@ if test x"$ar_check" != "xno"; then + fi + fi + +-dnl check if ar needs a wrapper to get rid of the 'u' option +-if test x"$ar_check" != "xno"; then +- AC_MSG_CHECKING(if ar complains about the 'u' option) +- rm -f vicetest.c +- touch vicetest.c +- $CC -c vicetest.c -o vicetest.o +- rm -f vicetest.c +- rm -f libvicetest.a +- complains=`$AR cru libvicetest.a vicetest.o 2>&1` +- if test x"$complains" != "x"; then +- AC_MSG_RESULT(yes) +- echo "using ar wrapper instead of ar directly" +- AR_WRAP="$AR" +- AR="\$(top_srcdir)/src/wrap-u-ar.sh \"$AR_WRAP\"" +- else +- AC_MSG_RESULT(no) +- fi +-fi +- + AC_CHECK_PROGS(MAKEINFO, makeinfo, no) + + AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no) +-- +2.21.0 + diff --git a/recipes-emulators/vice/files/0002-Hack-build-with-latest-FFMPEG.patch b/recipes-emulators/vice/files/0002-Hack-build-with-latest-FFMPEG.patch deleted file mode 100644 index b46ea3b..0000000 --- a/recipes-emulators/vice/files/0002-Hack-build-with-latest-FFMPEG.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6f69c122f0ea97b89bb0bb72cb75e97dc24d5506 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 8 Jun 2018 11:10:25 +0200 -Subject: [PATCH] Hack build with latest FFMPEG -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Taking videos in raw format won't work with ne FFMPEG. - -| ../../../vice-3.2/src/gfxoutputdrv/ffmpegdrv.c:363:34: error: 'CODEC_CAP_VARIABLE_FRAME_SIZE' undeclared (first use in this function); did you mean 'AV_CODEC_CAP_VARIABLE_FRAME_SIZE'? -| if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| AV_CODEC_CAP_VARIABLE_FRAME_SIZE - -| ../../../vice-3.2/src/gfxoutputdrv/ffmpegdrv.c:461:21: error: 'CODEC_FLAG_GLOBAL_HEADER' undeclared (first use in this function); did you mean 'AV_CODEC_FLAG_GLOBAL_HEADER'? -| c->flags |= CODEC_FLAG_GLOBAL_HEADER; -| ^~~~~~~~~~~~~~~~~~~~~~~~ -| AV_CODEC_FLAG_GLOBAL_HEADER - -| ../../../../../../../../../oe-core/workspace/sources/vice/src/gfxoutputdrv/ffmpegdrv.c:982:40: error: 'AVFMT_RAWPICTURE' undeclared (first use in this function); did you mean 'FF_API_AVPICTURE'? -| if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { -| ^~~~~~~~~~~~~~~~ -| FF_API_AVPICTURE - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/gfxoutputdrv/ffmpegdrv.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/gfxoutputdrv/ffmpegdrv.c b/src/gfxoutputdrv/ffmpegdrv.c -index 4748348..b52e39b 100644 ---- a/src/gfxoutputdrv/ffmpegdrv.c -+++ b/src/gfxoutputdrv/ffmpegdrv.c -@@ -360,7 +360,11 @@ static int ffmpegdrv_open_audio(AVFormatContext *oc, AVStream *st) - } - - audio_is_open = 1; -+#ifdef AV_CODEC_CAP_VARIABLE_FRAME_SIZE -+ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) { -+#else - if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { -+#endif - audio_inbuf_samples = 10000; - } else { - audio_inbuf_samples = c->frame_size; -@@ -454,7 +458,11 @@ static int ffmpegmovie_init_audio(int speed, int channels, soundmovie_buffer_t * - - /* Some formats want stream headers to be separate. */ - if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) -+#ifdef AV_CODEC_FLAG_GLOBAL_HEADER -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; -+#else - c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+#endif - - /* create resampler context */ - #ifndef HAVE_FFMPEG_AVRESAMPLE -@@ -787,7 +795,11 @@ static void ffmpegdrv_init_video(screenshot_t *screenshot) - - /* Some formats want stream headers to be separate. */ - if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) { -+#ifdef AV_CODEC_FLAG_GLOBAL_HEADER -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; -+#else - c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+#endif - } - - if (audio_init_done) { -@@ -967,6 +979,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot) - - video_st.frame->pts = video_st.next_pts++; - -+#ifdef AVFMT_RAWPICTURE - if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { - AVPacket pkt; - VICE_P_AV_INIT_PACKET(&pkt); -@@ -978,6 +991,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot) - - ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt); - } else { -+#endif - AVPacket pkt = { 0 }; - int got_packet; - -@@ -998,7 +1012,9 @@ static int ffmpegdrv_record(screenshot_t *screenshot) - } else { - ret = 0; - } -+#ifdef AVFMT_RAWPICTURE - } -+#endif - if (ret < 0) { - log_debug("Error while writing video frame"); - return -1; --- -2.14.3 - diff --git a/recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch b/recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch deleted file mode 100644 index 0b44a55..0000000 --- a/recipes-emulators/vice/files/0003-Set-fixed-VICEDIR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f4fa367ab6e79cbfd77254237335f383311006ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 9 Feb 2019 22:16:52 +0100 -Subject: [PATCH] Set fixed VICEDIR -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index c5139fd..402e893 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5010,6 +5010,7 @@ case "$host_os" in - AM_CONDITIONAL(ALTERNATE_DOCDIR, false) - ;; - esac -+VICEDIR="$libdir/vice" - AC_SUBST(VICEDIR) - AC_DEFINE_UNQUOTED(VICEDIR, "$VICEDIR", - [Where should we lookup for data files?]) --- -2.20.1 - diff --git a/recipes-emulators/vice/vice_3.2.bb b/recipes-emulators/vice/vice_3.3.bb similarity index 61% rename from recipes-emulators/vice/vice_3.2.bb rename to recipes-emulators/vice/vice_3.3.bb index cdf9d98..deec934 100644 --- a/recipes-emulators/vice/vice_3.2.bb +++ b/recipes-emulators/vice/vice_3.3.bb @@ -9,25 +9,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \ file://0001-fix-autoreconfig.patch \ - file://0002-Hack-build-with-latest-FFMPEG.patch \ - file://0003-Set-fixed-VICEDIR.patch \ + file://0002-Do-not-check-if-ar-suppurts-u-option.patch \ file://c64_16.png \ file://c64_32.png \ file://c64_48.png \ file://vice_64.desktop \ " -SRC_URI[md5sum] = "58ba6b6653097898e059e0194615705a" -SRC_URI[sha256sum] = "28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523" +SRC_URI[md5sum] = "b0797f534b33f638220418207d606cf5" +SRC_URI[sha256sum] = "1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d" inherit autotools pkgconfig gtk-icon-cache DEPENDS = " \ + glib-2.0-native \ bdftopcf-native \ mkfontdir-native \ mkfontscale-native \ xa-native \ bison-native \ - gtk+ \ + gtk+3 \ libav \ libsdl \ libpng \ @@ -38,7 +38,6 @@ DEPENDS = " \ mpg123 \ virtual/libgl \ vte9 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "gtkglext", "", d)} \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" @@ -54,15 +53,3 @@ EXTRA_OECONF = " \ --without-oss \ --libdir=${libdir} \ " - -do_install_append() { - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications - - for size in 16 32 48; do - install -d ${D}/${datadir}/icons/hicolor/${size}x${size}/apps - install -m 0644 ${WORKDIR}/c64_${size}.png ${D}/${datadir}/icons/hicolor/${size}x${size}/apps/c64.png - done -} - -FILES_${PN} += "${datadir}/icons"