[vice] New upstream release 3.2 (rfbz #4950)

commit 41f18754ccd37c9b2db75e1f6f7a7b836d17d64a Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Thu Jun 28 17:41:54 2018 +0200 New upstream release 3.2 (rfbz #4950) .gitignore | 1 + sources | 2 +- vice-htmlview.patch | 10 +++++----- vice-new-ffmpeg.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ vice-norpath.patch | 10 +++++----- vice.spec | 12 +++++++++--- 6 files changed, 70 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index f9339a8..db7efba 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vice-2.4.tar.gz vice-2.4.24.tar.gz vice-2.4.28.tar.gz /vice-3.1.tar.gz +/vice-3.2.tar.gz diff --git a/sources b/sources index 2df2c89..811b1be 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -f9018ca464b863da0bb1a82c56374432 vice-3.1.tar.gz +58ba6b6653097898e059e0194615705a vice-3.2.tar.gz a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2 c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2 1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2 diff --git a/vice-htmlview.patch b/vice-htmlview.patch index 89270c5..34406f0 100644 --- a/vice-htmlview.patch +++ b/vice-htmlview.patch @@ -1,8 +1,8 @@ -diff -ru vice-2.4.24.orig/src/arch/unix/x11/ui-resources.c vice-2.4.24.new/src/arch/unix/x11/ui-resources.c ---- vice-2.4.24.orig/src/arch/unix/x11/ui-resources.c 2015-07-26 18:00:51.000000000 +0200 -+++ vice-2.4.24.new/src/arch/unix/x11/ui-resources.c 2016-01-30 16:41:47.478138264 +0100 -@@ -172,7 +172,7 @@ - #ifdef MACOSX_SUPPORT +diff -up vice-3.2/src/arch/unix/x11/ui-resources.c.htmlview vice-3.2/src/arch/unix/x11/ui-resources.c +--- vice-3.2/src/arch/unix/x11/ui-resources.c.htmlview 2018-06-28 16:45:31.277140071 +0200 ++++ vice-3.2/src/arch/unix/x11/ui-resources.c 2018-06-28 16:46:40.220627630 +0200 +@@ -183,7 +183,7 @@ static int set_confirm_on_exit(int val, + #ifdef MACOSX_SUPPORT #define HTML_BROWSER_COMMAND_DEFAULT "/usr/bin/open %s" #else -#define HTML_BROWSER_COMMAND_DEFAULT "firefox %s" diff --git a/vice-new-ffmpeg.patch b/vice-new-ffmpeg.patch new file mode 100644 index 0000000..8c94f19 --- /dev/null +++ b/vice-new-ffmpeg.patch @@ -0,0 +1,49 @@ +diff -up vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c.ffmpeg vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c +--- vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c.ffmpeg 2018-06-28 17:11:46.602748172 +0200 ++++ vice-3.2.gtk/src/gfxoutputdrv/ffmpegdrv.c 2018-06-28 17:17:10.132040705 +0200 +@@ -360,7 +360,7 @@ static int ffmpegdrv_open_audio(AVFormat + } + + audio_is_open = 1; +- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { ++ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) { + audio_inbuf_samples = 10000; + } else { + audio_inbuf_samples = c->frame_size; +@@ -454,7 +454,7 @@ static int ffmpegmovie_init_audio(int sp + + /* Some formats want stream headers to be separate. */ + if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + /* create resampler context */ + #ifndef HAVE_FFMPEG_AVRESAMPLE +@@ -787,7 +787,7 @@ static void ffmpegdrv_init_video(screens + + /* Some formats want stream headers to be separate. */ + if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) { +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + if (audio_init_done) { +@@ -967,17 +967,7 @@ static int ffmpegdrv_record(screenshot_t + + video_st.frame->pts = video_st.next_pts++; + +- if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) { +- AVPacket pkt; +- VICE_P_AV_INIT_PACKET(&pkt); +- pkt.flags |= AV_PKT_FLAG_KEY; +- pkt.stream_index = video_st.st->index; +- pkt.data = (uint8_t*)video_st.frame; +- pkt.size = sizeof(AVPicture); +- pkt.pts = pkt.dts = video_st.frame->pts; +- +- ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt); +- } else { ++ { + AVPacket pkt = { 0 }; + int got_packet; + diff --git a/vice-norpath.patch b/vice-norpath.patch index d5f84de..90ec009 100644 --- a/vice-norpath.patch +++ b/vice-norpath.patch @@ -1,7 +1,7 @@ -diff -up vice-3.1/configure vice-3.1/configure.norpath ---- vice-3.1/configure 2017-03-30 22:40:32.000000000 +0200 -+++ vice-3.1/configure.norpath 2017-05-01 22:51:24.594241129 +0200 -@@ -25531,10 +25531,6 @@ _ACEOF +diff -up vice-3.2/configure.norpath vice-3.2/configure +--- vice-3.2/configure.norpath 2018-06-28 16:47:56.050161040 +0200 ++++ vice-3.2/configure 2018-06-28 16:49:02.342582313 +0200 +@@ -26166,10 +26166,6 @@ _ACEOF @@ -9,6 +9,6 @@ diff -up vice-3.1/configure vice-3.1/configure.norpath -rpath_line=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "$VICEDIR/lib"` -LDFLAGS="$LDFLAGS $rpath_line" - - ac_config_files="$ac_config_files Makefile vice.spec vice-gtk.spec vice-mint.spec vice-mint-sdl.spec build/Makefile build/amigaos/Makefile build/android/Makefile build/beos/Makefile build/macosx/Makefile build/mingw32/Makefile build/minix3/Makefile build/nextstep/Makefile build/openstep/Makefile build/openwatcom/Makefile build/qnx4/Makefile build/rhapsody/Makefile data/Makefile data/C128/Makefile data/C64/Makefile data/C64DTV/Makefile data/CBM-II/Makefile data/DRIVES/Makefile data/PET/Makefile data/PLUS4/Makefile data/SCPU64/Makefile data/PRINTER/Makefile data/VIC20/Makefile data/fonts/Makefile doc/Makefile doc/building/Makefile doc/html/Makefile doc/readmes/Makefile man/Makefile src/Makefile src/debug.h src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/info-files/Makefile src/arch/amigaos/info-files/morphos/Makefile src/arch/amigaos/mui/Makefile src/arch/android/Makefile src/arch/android/AnVICE/AndroidManifest.xml src/arch/android/AnVICE/Makefile src/arch/android/AnVICE /.settings/Makefile src/arch/android/AnVICE/assets-proto/Makefile src/arch/android/AnVICE/jni/Makefile src/arch/android/AnVICE/jni/locnet/Makefile src/arch/android/AnVICE/jni/locnet_x64/Makefile src/arch/android/AnVICE/jni/locnet_x64dtv/Makefile src/arch/android/AnVICE/jni/locnet_x64sc/Makefile src/arch/android/AnVICE/jni/locnet_x128/Makefile src/arch/android/AnVICE/jni/locnet_xcbm2/Makefile src/arch/android/AnVICE/jni/locnet_xcbm5x0/Makefile src/arch/android/AnVICE/jni/locnet_xpet/Makefile src/arch/android/AnVICE/jni/locnet_xplus4/Makefile src/arch/android/AnVICE/jni/locnet_xscpu64/Makefile src/arch/android/AnVICE/jni/locnet_xvic/Makefile src/arch/android/AnVICE/jni/locnet_al/Makefile src/arch/android/AnVICE/jni/sdl/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_dtv_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_sc/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_128/Makefile s rc/arch/android/AnVICE/jni/vice_x64_sc_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2/Makefile src/arch/andr oid/AnVICE/jni/vice_x64_sc_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x128_2_5x0_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_5x0/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Ma kefile src/arch/android/AnVICE/jni/vice_xscpu64/Makefile src/arch/android/AnVICE/jni/vice_xvic/Makefile src/arch/android/AnVICE/res-proto/Makefile src/arch/android/AnVICE/res-proto/layout/Makefile src/arch/android/AnVICE/res-proto/values/Makefile src/arch/android/AnVICE/src-proto/Makefile src/arch/android/AnVICE/src-proto/com/Makefile src/arch/android/AnVICE/src-proto/com/locnet/Makefile src/arch/android/AnVICE/src-proto/com/locnet/vice/Makefile src/arch/beos/Makefile src/arch/gtk3/Makefile src/arch/msdos/Makefile src/arch/os2/Makefile src/arch/os2/dialogs/Makefile src/arch/os2/doc/Makefile src/arch/os2/fonts/Makefile src/arch/os2/icons/Makefile src/arch/os2/kbd/Makefile src/arch/os2/snippets/Makefile src/arch/os2/unused/Makefile src/arch/os2/unused/pm/Makefile src/arch/os2/watcom/Makefile src/arch/sdl/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/sortix-files/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arc h/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/minix/Makefile src/arch/unix/next_open_rhap/Makefile src/arch/unix/next_open_rhap/vice.info src/arch/unix/qnx4/Makefile src/arch/unix/qnx6/Makefile src/arch/unix/readline/Makefile src/arch/unix/sco_sol/Makefile src/arch/unix/skyos/Makefile src/arch/unix/skyos/icons/Makefile src/arch/unix/x11/Makefile src/arch/unix/x11/gnome/Makefile src/arch/unix/x11/xaw/Makefile src/arch/unix/x11/xaw/widgets/Makefile src/arch/unix/macosx/Makefile src/arch/unix/macosx/cocoa/Makefile src/arch/unix/macosx/cocoa/view/Makefile src/arch/unix/macosx/cocoa/menu/Makefile src/arch/unix/macosx/cocoa/dialog/Makefile src/arch/unix/macosx/Resources/Makefile src/arch/unix/macosx/Resources/English.lproj/Makefile src/arch/watcom-source-wrappers/Makefile src/arch/win32/Makefile src/arch/win32/vice-version.bat src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/msvc/Makefile src/arch/win32/msvc/wpcap/Makefile src/arch/win32/msvc/wpcap/net /Makefile src/arch/win32/utils/Makefile src/arch/win32/vs_tmpl/Makefile src/arch/win32/watcom/Makefile src/buildtools/Makefile src/c128/Makefile src/c64/Makefile src/c64/cart/Makefile src/c64dtv/Makefile src/scpu64/Makefile src/cbm2/Makefile src/core/Makefile src/crtc/Makefile src/diag/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dcr/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/hwsiddrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/iodrv/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/mididrv/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/platform/Makefile src/plus4/Makefile src/printerdrv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile sr c/serial/Makefile src/sid/Makefile src/socketdrv/Makefile src/sounddrv/Makefile src/tape/Makefile src/tapeport/Makefile src/userport/Makefile src/vdc/Makefile src/vdrive/Makefile src/vic20/Makefile src/vic20/cart/Makefile src/vicii/Makefile src/viciisc/Makefile src/viciivsid/Makefile src/video/Makefile src/version.h src/vice-version.sh po/Makefile.in" + ac_config_files="$ac_config_files Makefile vice.spec vice-gtk.spec vice-mint.spec vice-mint-sdl.spec build/Makefile build/amigaos/Makefile build/android/Makefile build/beos/Makefile build/macosx/Makefile build/mingw32/Makefile build/minix3/Makefile build/nextstep/Makefile build/openstep/Makefile build/openwatcom/Makefile build/qnx4/Makefile build/rhapsody/Makefile data/Makefile data/C128/Makefile data/C64/Makefile data/C64DTV/Makefile data/CBM-II/Makefile data/DRIVES/Makefile data/PET/Makefile data/PLUS4/Makefile data/SCPU64/Makefile data/PRINTER/Makefile data/VIC20/Makefile data/fonts/Makefile doc/Makefile doc/building/Makefile doc/html/Makefile doc/readmes/Makefile man/Makefile src/Makefile src/debug.h src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/info-files/Makefile src/arch/amigaos/info-files/morphos/Makefile src/arch/amigaos/mui/Makefile src/arch/android/Makefile src/arch/android/AnVICE/AndroidManifest.xml src/arch/android/AnVICE/Makefile src/arch/android/AnVICE /.settings/Makefile src/arch/android/AnVICE/assets-proto/Makefile src/arch/android/AnVICE/jni/Makefile src/arch/android/AnVICE/jni/locnet/Makefile src/arch/android/AnVICE/jni/locnet_x64/Makefile src/arch/android/AnVICE/jni/locnet_x64dtv/Makefile src/arch/android/AnVICE/jni/locnet_x64sc/Makefile src/arch/android/AnVICE/jni/locnet_x128/Makefile src/arch/android/AnVICE/jni/locnet_xcbm2/Makefile src/arch/android/AnVICE/jni/locnet_xcbm5x0/Makefile src/arch/android/AnVICE/jni/locnet_xpet/Makefile src/arch/android/AnVICE/jni/locnet_xplus4/Makefile src/arch/android/AnVICE/jni/locnet_xscpu64/Makefile src/arch/android/AnVICE/jni/locnet_xvic/Makefile src/arch/android/AnVICE/jni/locnet_al/Makefile src/arch/android/AnVICE/jni/sdl/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_dtv_128_5x0/Makefile src/arch/android/AnVICE/jni/vice_x64_sc/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_128/Makefile s rc/arch/android/AnVICE/jni/vice_x64_sc_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_dtv_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2/Makefile src/arch/andr oid/AnVICE/jni/vice_x64_sc_scpu_128_2_5x0_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_2_pet_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_4/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_20/Makefile src/arch/android/AnVICE/jni/vice_x64_sc_scpu_128_5x0_4_20/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu/Makefile src/arch/android/AnVICE/jni/vice_x64sc_scpu_128_2_pet_4_20/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x128_2_5x0_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_5x0/Makefile src/arch/android/AnVICE/jni/vice_xcbm2_pet/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Ma kefile src/arch/android/AnVICE/jni/vice_xscpu64/Makefile src/arch/android/AnVICE/jni/vice_xvic/Makefile src/arch/android/AnVICE/res-proto/Makefile src/arch/android/AnVICE/res-proto/layout/Makefile src/arch/android/AnVICE/res-proto/values/Makefile src/arch/android/AnVICE/src-proto/Makefile src/arch/android/AnVICE/src-proto/com/Makefile src/arch/android/AnVICE/src-proto/com/locnet/Makefile src/arch/android/AnVICE/src-proto/com/locnet/vice/Makefile src/arch/beos/Makefile src/arch/gtk3/Makefile src/arch/gtk3/widgets/Makefile src/arch/gtk3/widgets/base/Makefile src/arch/msdos/Makefile src/arch/sdl/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/sortix-files/Makefile src/arch/sdl/syllable-files/Makefile src/arch/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/minix/Makefile src/arch/unix/next_open_rhap/Makefile src/arch/unix/next_open_rhap/vice.info src/arch/unix/qnx4/Makefile src/arch/unix/qnx6/Makefile src/arch/unix/readline/Makefile src/arch/unix/sco_sol/Makefile src/arch/unix/ skyos/Makefile src/arch/unix/skyos/icons/Makefile src/arch/unix/x11/Makefile src/arch/unix/x11/gnome/Makefile src/arch/unix/x11/xaw/Makefile src/arch/unix/x11/xaw/widgets/Makefile src/arch/unix/macosx/Makefile src/arch/unix/macosx/cocoa/Makefile src/arch/unix/macosx/cocoa/view/Makefile src/arch/unix/macosx/cocoa/menu/Makefile src/arch/unix/macosx/cocoa/dialog/Makefile src/arch/unix/macosx/Resources/Makefile src/arch/unix/macosx/Resources/English.lproj/Makefile src/arch/win32/Makefile src/arch/win32/evc/Makefile src/arch/win32/mingw32/Makefile src/arch/win32/mingw32/wpcap/Makefile src/arch/win32/mingw32/wpcap/net/Makefile src/arch/win32/utils/Makefile src/buildtools/Makefile src/c128/Makefile src/c64/Makefile src/c64/cart/Makefile src/c64dtv/Makefile src/scpu64/Makefile src/cbm2/Makefile src/core/Makefile src/crtc/Makefile src/diag/Makefile src/diskimage/Makefile src/drive/Makefile src/drive/iec/Makefile src/drive/iec/c64exp/Makefile src/drive/iec/plus4exp/Makefile src/drive/iec128dc r/Makefile src/drive/iecieee/Makefile src/drive/ieee/Makefile src/drive/tcbm/Makefile src/fileio/Makefile src/fsdevice/Makefile src/gfxoutputdrv/Makefile src/hwsiddrv/Makefile src/iecbus/Makefile src/imagecontents/Makefile src/iodrv/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/mididrv/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/plus4/Makefile src/printerdrv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile src/serial/Makefile src/sid/Makefile src/socketdrv/Makefile src/sounddrv/Makefile src/tape/Makefile src/tapeport/Makefile src/userport/Makefile src/vdc/Makefile src/vdrive/Makefile src/vic20/Makefile src/vic20/cart/Makefile src/vicii/Makefile src/viciisc/Makefile src/viciivsid/Makefile src/video/Makefile src/version.h src/vice-version.sh po/Makefile.in" cat >confcache <<\_ACEOF diff --git a/vice.spec b/vice.spec index 922d17c..9a418d4 100644 --- a/vice.spec +++ b/vice.spec @@ -1,6 +1,6 @@ Name: vice -Version: 3.1 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: Emulator for a variety of Commodore 8bit machines Group: Applications/Emulators License: GPLv2+ @@ -24,6 +24,7 @@ Source15: xvic.metainfo.xml Patch1: vice-2.4.24-datadir.patch Patch2: vice-htmlview.patch Patch3: vice-norpath.patch +Patch4: vice-new-ffmpeg.patch BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXxf86vm-devel @@ -47,6 +48,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gettext BuildRequires: info +BuildRequires: xa BuildRequires: desktop-file-utils BuildRequires: xorg-x11-font-utils BuildRequires: libappstream-glib @@ -147,6 +149,7 @@ sed -i 's/\r//' `find -name "*.cc"` %patch1 -p1 -z .datadir %patch2 -p1 -z .htmlview %patch3 -p1 -z .norpath +%patch4 -p1 -z .ffmpeg for i in man/*.1 doc/*.info* README AUTHORS; do iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp touch -r $i $i.tmp @@ -159,7 +162,7 @@ cp -a %{name}-%{version}.gtk %{name}-%{version}.sdl %build -COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch" +COMMON_FLAGS="--enable-ethernet --enable-parsid --without-oss --disable-arch --enable-external-ffmpeg" # workaround needed to fix incorrect toolchain check in configure script export toolchain_check=no @@ -311,6 +314,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jun 28 2018 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 3.2-1 +- New upstream release 3.2 (rfbz #4950) + * Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild