commit e1aaf88df4b349688cc520e9c4dcd7bd31452f9e Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Mon Jun 27 20:08:20 2016 +0200 New upstream release 2.4.28 .gitignore | 1 + sources | 2 +- vice-2.4.28-sdl-build-fix.patch | 11 +++++++++++ vice-norpath.patch | 18 +++++++++--------- vice.spec | 28 ++++++++++++++++++++-------- 5 files changed, 42 insertions(+), 18 deletions(-) --- diff --git a/.gitignore b/.gitignore index 820d723..5bd5a6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ vice-miniicons.tar.bz2 vice-normalicons.tar.bz2 vice-2.4.tar.gz vice-2.4.24.tar.gz +vice-2.4.28.tar.gz diff --git a/sources b/sources index 4c51509..655855c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ a4936bbfe1cc7b37d4fd93f0901de974 vice-largeicons.tar.bz2 c944e3eeaac9c3962983423f8e7609e7 vice-miniicons.tar.bz2 1e024cef652bc4bf929905b182ef689b vice-normalicons.tar.bz2 -bd064f09908737951ccc75e734b6720c vice-2.4.24.tar.gz +533554f5d7680b85c0954e4d4811274a vice-2.4.28.tar.gz diff --git a/vice-2.4.28-sdl-build-fix.patch b/vice-2.4.28-sdl-build-fix.patch new file mode 100644 index 0000000..6f340ac --- /dev/null +++ b/vice-2.4.28-sdl-build-fix.patch @@ -0,0 +1,11 @@ +diff -up vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c~ vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c +--- vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c~ 2016-05-18 23:40:30.000000000 +0200 ++++ vice-2.4.28.sdl/src/arch/sdl/ssi2001-drv.c 2016-06-27 19:11:06.260782212 +0200 +@@ -30,6 +30,7 @@ + + #ifdef UNIX_COMPILE + #include "../unix/ssi2001-drv.c" ++#include "../unix/io-access.c" + #endif + + #if defined(WIN32_COMPILE) && !defined(__XBOX__) diff --git a/vice-norpath.patch b/vice-norpath.patch index 2cf8dfd..1bb4154 100644 --- a/vice-norpath.patch +++ b/vice-norpath.patch @@ -1,14 +1,14 @@ -diff -ru vice-2.4.24.orig/configure vice-2.4.24.new/configure ---- vice-2.4.24.orig/configure 2015-12-16 03:48:02.000000000 +0100 -+++ vice-2.4.24.new/configure 2016-01-30 17:15:32.625620278 +0100 -@@ -23490,10 +23490,6 @@ +diff -up vice-2.4.28/configure.norpath vice-2.4.28/configure +--- vice-2.4.28/configure.norpath 2016-06-27 18:52:10.952861895 +0200 ++++ vice-2.4.28/configure 2016-06-27 18:54:24.674315069 +0200 +@@ -24620,10 +24620,6 @@ _ACEOF -# Add path with private dynamic ffmpeg libs to the search path --if test x"$norpath" != "xyes"; then -- LDFLAGS="$LDFLAGS -Wl,-rpath,$VICEDIR/lib" --fi - - 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/build-android.sh 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/gentranslate_h.sh src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/genintl_h.sh 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_c64cart/Makefile src/arch/android/AnVICE/jni/vice_c64exp/Makefile src/arch/android/AnVICE/jni/vice_cbm2common/Makefile src/arch/android/A nVICE/jn i/vice_common/Makefile src/arch/android/AnVICE/jni/vice_commonall/Makefile src/arch/android/AnVICE/jni/vice_commoncart/Makefile src/arch/android/AnVICE/jni/vice_crtc/Makefile src/arch/android/AnVICE/jni/vice_iec/Makefile src/arch/android/AnVICE/jni/vice_ieeepar/Makefile src/arch/android/AnVICE/jni/vice_tape/Makefile src/arch/android/AnVICE/jni/vice_vicii/Makefile src/arch/android/AnVICE/jni/vice_viciisc/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Makefile 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/arc h/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/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/vac++/Makefile src/arch/os2/vac++/ctools/Makefile src/arch/os2/vac++/incl/Makefile src/arch/os2/vac++/x64/Makefile src/arch/os2/vac++/x64dtv/Makefile src/arch/os2/vac++/x64sc/Makefile src/arch/os2/vac++/x128/Makefile src/arch/os2/vac++/xcbm2/Makefile src/arch/os2/vac++/xcbm5x0/Makefile src/arch/os2/vac++/xpet/Makefile src/arch/os2/vac++/xplus4/Makefile src/arch/os2/vac++/xvic/Makefile src/arch/os2/watcom/Makefile src/arch/sdl/M akefile src/arch/sdl/dingoo-files/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arch/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/hpux/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/arc h/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/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/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/iecbus/Makefile src/imagecontents/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/Makefile src/monitor/Makefile src/parallel/Makefile src/pet/Makefile src/platform/Makefile src/plus4/Makefile src /printer drv/Makefile src/raster/Makefile src/rs232drv/Makefile src/rtc/Makefile src/samplerdrv/Makefile src/serial/Makefile src/sid/Makefile src/sounddrv/Makefile src/tape/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 po/Makefile.in" +-rpath_line=`${CONFIG_SHELL-/bin/sh} 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/build-android.sh 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/gentranslate_h.sh src/arch/Makefile src/arch/amigaos/Makefile src/arch/amigaos/genintl_h.sh 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_c64cart/Makefile src/arch/android/AnVICE/jni/vice_c64exp/Makefile src/arch/android/AnVICE/jni/vice_cbm2common/Makefile src/arch/android/A nVICE/jn i/vice_common/Makefile src/arch/android/AnVICE/jni/vice_commonall/Makefile src/arch/android/AnVICE/jni/vice_commoncart/Makefile src/arch/android/AnVICE/jni/vice_crtc/Makefile src/arch/android/AnVICE/jni/vice_iec/Makefile src/arch/android/AnVICE/jni/vice_ieeepar/Makefile src/arch/android/AnVICE/jni/vice_tape/Makefile src/arch/android/AnVICE/jni/vice_vicii/Makefile src/arch/android/AnVICE/jni/vice_viciisc/Makefile src/arch/android/AnVICE/jni/vice_x128/Makefile src/arch/android/AnVICE/jni/vice_x64/Makefile src/arch/android/AnVICE/jni/vice_x64dtv/Makefile src/arch/android/AnVICE/jni/vice_x64sc/Makefile src/arch/android/AnVICE/jni/vice_xcbm2/Makefile src/arch/android/AnVICE/jni/vice_xcbm5x0/Makefile src/arch/android/AnVICE/jni/vice_xpet/Makefile src/arch/android/AnVICE/jni/vice_xplus4/Makefile 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/arc h/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/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/dingoo-files/Makefile src/arch/sdl/msvc-files/Makefile src/arch/sdl/qnx4/Makefile src/arch/sdl/syllable-files/Makefile src/arch/sdl/win32-watcom/Makefile src/arch/unix/Makefile src/arch/unix/gui/Makefile src/arch/unix/hpux/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/Mak efile 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/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/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/iecbus/Makefile src/imagecontents/Makefile src/joyport/Makefile src/lib/Makefile src/lib/ffmpeg/Makefile src/lib/p64/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 src/serial/Makefile src/sid/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 po/Makef ile.in" + cat >confcache <<\_ACEOF diff --git a/vice.spec b/vice.spec index 4088a6a..3f8bafd 100644 --- a/vice.spec +++ b/vice.spec @@ -1,6 +1,6 @@ Name: vice -Version: 2.4.24 -Release: 3%{?dist} +Version: 2.4.28 +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-2.4.28-sdl-build-fix.patch BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel BuildRequires: libXrandr-devel BuildRequires: giflib-devel libjpeg-devel libpng-devel @@ -123,9 +124,13 @@ Vice Commodore VIC-20 Emulator. %prep %setup -c -q pushd %{name}-%{version} +sed -i 's/\r//' `find -name "*.h"` +sed -i 's/\r//' `find -name "*.c"` +sed -i 's/\r//' `find -name "*.cc"` %patch1 -p1 -z .datadir %patch2 -p1 -z .htmlview %patch3 -p1 -z .norpath +%patch4 -p1 -z .norpath 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 @@ -135,8 +140,6 @@ popd mv %{name}-%{version} %{name}-%{version}.gtk cp -a %{name}-%{version}.gtk %{name}-%{version}.sdl -# for %%doc -ln -s %{name}-%{version}.gtk/doc doc %build @@ -149,18 +152,22 @@ export CXX=g++ pushd %{name}-%{version}.gtk %configure --enable-gnomeui --enable-fullscreen $COMMON_FLAGS + # Ensure the system versions of these are used + rm -r src/lib/lib* src/lib/ffmpeg make %{?_smp_mflags} popd pushd %{name}-%{version}.sdl %configure --enable-sdlui $COMMON_FLAGS + # Ensure the system versions of these are used + rm -r src/lib/lib* src/lib/ffmpeg make %{?_smp_mflags} popd %install pushd %{name}-%{version}.gtk -make install DESTDIR=$RPM_BUILD_ROOT VICEDIR=%{_datadir}/%{name} +%make_install VICEDIR=%{_datadir}/%{name} popd pushd %{name}-%{version}.sdl @@ -179,8 +186,8 @@ popd %find_lang %{name} rm -f $RPM_BUILD_ROOT%{_infodir}/dir # for some reason make install drops a .txt and .pdf in the infodir ... ? -rm -f $RPM_BUILD_ROOT%{_infodir}/%{name}.txt* -rm -f $RPM_BUILD_ROOT%{_infodir}/%{name}.pdf* +rm $RPM_BUILD_ROOT%{_infodir}/%{name}.txt* +rm $RPM_BUILD_ROOT%{_infodir}/%{name}.pdf* # vice installs its docs under /usr/share/vice/doc, we install them ourselves # with %%doc, so nuke vice's install and create a symlink for the help function rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc @@ -240,7 +247,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files common -f %{name}.lang %doc %{name}-%{version}.gtk/AUTHORS %{name}-%{version}.gtk/ChangeLog %doc %{name}-%{version}.gtk/FEEDBACK %{name}-%{version}.gtk/README -%doc doc/iec-bus.txt doc/html/*.html doc/html/images +%doc %{name}-%{version}.gtk/doc/iec-bus.txt +%doc %{name}-%{version}.gtk/doc/html/*.html +%doc %{name}-%{version}.gtk/doc/html/images %{_bindir}/c1541 %{_bindir}/cartconv %{_bindir}/petcat @@ -286,6 +295,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Jun 27 2016 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 2.4.28-1 +- New upstream release 2.4.28 + * Mon Feb 22 2016 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 2.4.24-3 - Actually create the vice meta-package so that upgrades work