From: Jakub Bogusz Date: Wed, 28 Jun 2023 20:32:34 +0000 (+0200) Subject: - updated to 3.7.1 X-Git-Tag: auto/th/vice-3.7.1-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=8bac1f5902c8fcda5c8a60a5b678101d5ae774d4;p=packages%2Fvice.git - updated to 3.7.1 - added bash,opt,link patches - package HMTL docs in -doc subpackage - point vice-c64 desktop file to x64sc instead of deprecated x64 emulator - added bconds for hardware SID devices --- diff --git a/vice-bash.patch b/vice-bash.patch new file mode 100644 index 0000000..dfe7176 --- /dev/null +++ b/vice-bash.patch @@ -0,0 +1,15 @@ +--- vice-3.7.1/src/Makefile.am.orig 2022-12-28 00:56:56.000000000 +0100 ++++ vice-3.7.1/src/Makefile.am 2023-06-27 19:30:24.598179035 +0200 +@@ -515,10 +515,10 @@ infocontrib.h: $(srcdir)/buildtools/geni + + # also update the version/date in the readme + # FIXME: this is not the exact right place for this +- @$(SHELL) $(srcdir)/buildtools/updatereadme.sh $(top_srcdir)/README $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h ++ @bash $(srcdir)/buildtools/updatereadme.sh $(top_srcdir)/README $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h + # also update the version/date in the index.html + # FIXME: this is not the exact right place for this +- @$(SHELL) $(srcdir)/buildtools/updateindex.sh $(top_srcdir)/doc/html/index.html $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h ++ @bash $(srcdir)/buildtools/updateindex.sh $(top_srcdir)/doc/html/index.html $(top_srcdir)/configure.ac $(top_srcdir)/src/vicedate.h + + arch_gtk3_lib = $(top_builddir)/src/arch/gtk3/libarch.a + arch_gtk3_widgets_lib = $(top_builddir)/src/arch/gtk3/widgets/libwidgets.a diff --git a/vice-c64.desktop b/vice-c64.desktop index 14a9306..dc78533 100644 --- a/vice-c64.desktop +++ b/vice-c64.desktop @@ -2,7 +2,7 @@ Name=VICE C64 emulator Name[pl]=Emulator C64 VICE Icon=c64icon -Exec=x64 +Exec=x64sc Terminal=false Type=Application Categories=Utility;Emulator; diff --git a/vice-fonts.patch b/vice-fonts.patch deleted file mode 100644 index 7a1fe43..0000000 --- a/vice-fonts.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- vice-2.2/data/fonts/Makefile.am.orig 2011-02-20 15:01:38.490973392 +0100 -+++ vice-2.2/data/fonts/Makefile.am 2011-02-20 21:21:36.078979259 +0100 -@@ -6,20 +6,3 @@ - - EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon - --install: install-data-am --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ @echo "Preparing fontdir, please wait..." ; \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ if [ ! `fc-cache --list > /dev/null 2>&1` ] ; then \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ if test "x${HOME}" != "x" ; then \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ mkdir ${HOME}/.fonts > /dev/null 2>&1 ; \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ cp $(fontsdir)/CBM.ttf ${HOME}/.fonts ; \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fc-cache ; \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ else \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ echo '$$HOME not set... giving up.' ; \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fi \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ else \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ echo 'fc-cache not available... giving up.' ; \ --@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@ fi --@SDL_COMPILE_FALSE@ @echo "Preparing fontdir..." ; \ --@SDL_COMPILE_FALSE@ cd $(DESTDIR)$(fontsdir) ; \ --@SDL_COMPILE_FALSE@ bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \ --@SDL_COMPILE_FALSE@ ${MKFONTDIR_BIN} . diff --git a/vice-info.patch b/vice-info.patch index d7ee3fe..2e998fa 100644 --- a/vice-info.patch +++ b/vice-info.patch @@ -1,6 +1,5 @@ -diff -Nru vice-1.6/doc/vice.texi vice-1.6.new/doc/vice.texi ---- vice-1.6/doc/vice.texi Sun Dec 10 17:16:19 2000 -+++ vice-1.6.new/doc/vice.texi Mon Apr 9 01:55:48 2001 +--- vice-3.7.1/doc/vice.texi.orig 2022-12-28 00:57:48.000000000 +0100 ++++ vice-3.7.1/doc/vice.texi 2023-06-27 21:12:12.245091073 +0200 @@ -6,9 +6,11 @@ @ifinfo @@ -16,3 +15,56 @@ diff -Nru vice-1.6/doc/vice.texi vice-1.6.new/doc/vice.texi @end format @end ifinfo +@@ -1840,7 +1842,7 @@ files}). + * Romset files:: Files defining the machine's ROM set. + @end menu + +-@node ROM files, Keymap files, Gtk3 Hotkeys files, System files, System files ++@node ROM files, Keymap files, Gtk3 Hotkeys files, System files + @section ROM files + + Every emulator requires its own ROM set. For the VIC20 and the C64, the +@@ -5178,7 +5180,7 @@ xpet can handle the following devices on + + xplus4 control ports and devices: + +-@multitable @columnfractions .05 .33 .05 .05 .05 .05 ++@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05 + @headitem nr + @tab device + @tab N1 +@@ -8047,8 +8049,8 @@ Strings specifying the RS232 devices (@p + + The windows driver understands various options passed in the so called "mode string" + after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]} +-@code{[data=d]} @code{[stop=s]} @code{[to={on|off}]} @code{[xon={on|off}]} @code{[odsr={on|off}]} +-@code{[octs={on|off}]} @code{[dtr={on|off|hs}]} @code{[rts={on|off|hs|tg}]} @code{[idsr={on|off}]} ++@code{[data=d]} @code{[stop=s]} @code{[to=@{on|off@}]} @code{[xon=@{on|off@}]} @code{[odsr=@{on|off@}]} ++@code{[octs=@{on|off@}]} @code{[dtr=@{on|off|hs@}]} @code{[rts=@{on|off|hs|tg@}]} @code{[idsr=@{on|off@}]} + @end table + + @table @code +@@ -8179,8 +8181,8 @@ Specify as RS232 devices 1, 2, 3 + + The windows driver understands various options passed in the so called "mode string" + after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]} +-@code{[data=d]} @code{[stop=s]} @code{[to={on|off}]} @code{[xon={on|off}]} @code{[odsr={on|off}]} +-@code{[octs={on|off}]} @code{[dtr={on|off|hs}]} @code{[rts={on|off|hs|tg}]} @code{[idsr={on|off}]} ++@code{[data=d]} @code{[stop=s]} @code{[to=@{on|off@}]} @code{[xon=@{on|off@}]} @code{[odsr=@{on|off@}]} ++@code{[octs=@{on|off@}]} @code{[dtr=@{on|off|hs@}]} @code{[rts=@{on|off|hs|tg@}]} @code{[idsr=@{on|off@}]} + @end table + + @table @code +--- vice-3.7.1/doc/Makefile.am.orig 2022-12-28 00:56:56.000000000 +0100 ++++ vice-3.7.1/doc/Makefile.am 2023-06-27 19:26:40.039395574 +0200 +@@ -29,8 +29,8 @@ STYLE_TOOLS = \ + # VICE_DOX is conditionally extended with vice.pdf + VICE_DOX = @VICE_PDF_FILE_NAME@ + +-# info_TEXINFOS = vice.texi +-# AM_MAKEINFOFLAGS = -D$(PLATFORM_DOX_FLAGS) ++info_TEXINFOS = vice.texi ++AM_MAKEINFOFLAGS = -D$(PLATFORM_DOX_FLAGS) + + dist_doc_DATA = $(MISC_DOX) $(VICE_DOX) + diff --git a/vice-link.patch b/vice-link.patch new file mode 100644 index 0000000..1bb49d6 --- /dev/null +++ b/vice-link.patch @@ -0,0 +1,47 @@ +--- vice-3.7.1/configure.ac.orig 2023-06-28 16:28:44.575827236 +0200 ++++ vice-3.7.1/configure.ac 2023-06-28 16:32:02.374755667 +0200 +@@ -2190,8 +2190,11 @@ if test x"$is_unix_x11" = "xyes" -o x"$i + if test x"$UNIX_NETWORK_HEADERS_PRESENT" = "xyes"; then + + dnl Check for possible extra needed network libraries ++ AC_CHECK_FUNC([dgettext], [], [ + AC_CHECK_LIB(intl, dgettext,[ NETPLAY_LIBS="-lintl $NETPLAY_LIBS"; + LIBS="-lintl $LIBS"],,) ++ ]) ++ AC_CHECK_FUNC([gethostbyname], [], [ + AC_CHECK_LIB(nsl, gethostbyname,[ NETPLAY_LIBS="-lnsl $NETPLAY_LIBS"; + LIBS="-lnsl $LIBS"],,) + AC_CHECK_LIB(socket, gethostbyname,[ NETPLAY_LIBS="-lsocket $NETPLAY_LIBS"; +@@ -2202,6 +2205,7 @@ if test x"$is_unix_x11" = "xyes" -o x"$i + LIBS="-lnet $LIBS"],,) + AC_CHECK_LIB(inet, gethostbyname,[ NETPLAY_LIBS="-linet $NETPLAY_LIBS"; + LIBS="-linet $LIBS"],,) ++ ]) + + dnl Check for needed functions + UNIX_NETWORK_FUNCS_PRESENT=yes +@@ -2524,8 +2524,10 @@ if test x"$enable_ethernet" = "xyes"; th + fi + else + dnl libpcap.a on Unix ++ AC_CHECK_FUNC([gethostbyname], [], [ + AC_CHECK_LIB(nsl, gethostbyname,[ LIBS="-lnsl $LIBS" ],,) + AC_CHECK_LIB(socket, gethostbyname,[ LIBS="-lsocket $LIBS" ],,) ++ ]) + AC_CHECK_LIB(pcap, pcap_inject,[ + AC_DEFINE(HAVE_PCAP,,[Support for PCAP library.]) + AC_DEFINE(HAVE_RAWNET,,[Support for CS8900A ethernet controller.]) +@@ -3057,11 +3057,13 @@ AC_CHECK_TYPES(off_t, + + dnl some platforms have some of the functions in libbsd, + dnl so we check it out first. ++AC_CHECK_FUNC([gettimeofday], [], [ + AC_CHECK_LIB(bsd,gettimeofday,,,$LIBS) + + dnl some platforms have some of the functions in libposix, + dnl so we check it out second. + AC_CHECK_LIB(posix,gettimeofday,,,$LIBS) ++]) + + AC_CHECK_FUNCS(gettimeofday memmove atexit strerror strcasecmp strncasecmp dirname mkstemp swab getcwd getpwuid random rewinddir strtok strtok_r strtoul snprintf vsnprintf ltoa ultoa stpcpy strlcpy strlwr strrev fseeko ftello _fseeki64 _ftelli64) + AC_CHECK_FUNCS(strdup, [have_strdup_func=yes], [have_strdup_func=no]) diff --git a/vice-opt.patch b/vice-opt.patch new file mode 100644 index 0000000..db3be97 --- /dev/null +++ b/vice-opt.patch @@ -0,0 +1,17 @@ +--- vice-3.7.1/configure.ac.orig 2022-12-28 00:56:56.000000000 +0100 ++++ vice-3.7.1/configure.ac 2023-06-28 16:28:44.575827236 +0200 +@@ -41,10 +41,10 @@ dnl This has to happen before any other + + dnl Set VICE's compiler flags (can be overridden by the user) + VICE_CPPFLAGS="-I\$(top_srcdir)/src/arch/systemheaderoverride" +-VICE_CFLAGS="-g -O3" +-VICE_CXXFLAGS="-g -O3" +-VICE_OBJCFLAGS="-g -O3" +-VICE_LDFLAGS="" ++VICE_CFLAGS="$CFLAGS" ++VICE_CXXFLAGS="$CXXFLAGS" ++VICE_OBJCFLAGS="$OBJCFLAGS" ++VICE_LDFLAGS="$LDFLAGS" + + dnl Avoid "ar: `u' modifier ignored since `D' is the default (see `U')" warning + dnl caused by a longstanding bug in libtool. diff --git a/vice.spec b/vice.spec index d53c1ed..a25ffbd 100644 --- a/vice.spec +++ b/vice.spec @@ -1,19 +1,25 @@ -# TODO -# - fonts-TTF-CBM subpackage: -# %{_fontsdir}/TTF/CBM.ttf # # Conditional build: +%bcond_without ieee1284 # IEEE 1284 (parallel port) support for ParSID +%bcond_without openmp # OpenMP support %bcond_without pulseaudio # pulseaudio support +%bcond_with catweasel # CatWeasel MK3 (PCI) hardware SID support +%bcond_with hardsid # HardSID (ISA/PCI) hardware SID support +%bcond_with parsid # ParSID (IEEE1284) hardware SID support +%bcond_with ssi2001 # SSI2001 (ISA) hardware SID support # +%if %{without parsid} +%undefine with_ieee1284 +%endif Summary: Versatile Commodore Emulator Summary(pl.UTF-8): Uniwersalny emulator Commodore Name: vice -Version: 3.3 -Release: 3 +Version: 3.7.1 +Release: 1 License: GPL v2+ Group: Applications/Emulators -Source0: http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/%{name}-%{version}.tar.gz -# Source0-md5: b0797f534b33f638220418207d606cf5 +Source0: https://downloads.sourceforge.net/vice-emu/%{name}-%{version}.tar.gz +# Source0-md5: ffcb48e9b688d14dc5f86de22c30ee32 Source1: %{name}-c128.desktop Source2: %{name}-c64.desktop Source3: %{name}-cbm2.desktop @@ -21,46 +27,50 @@ Source4: %{name}-pet.desktop Source5: %{name}-plus4.desktop Source6: %{name}-vic20.desktop Patch0: %{name}-info.patch -Patch1: %{name}-fonts.patch -URL: http://vice-emu.sourceforge.net/ +Patch1: %{name}-bash.patch +Patch2: %{name}-opt.patch +Patch3: %{name}-link.patch +URL: https://vice-emu.sourceforge.io/ +BuildRequires: OpenGL-GLU-devel BuildRequires: OpenGL-GLX-devel -BuildRequires: SDL-devel >= 1.2.0 +BuildRequires: SDL2-devel >= 2.0 BuildRequires: alsa-lib-devel -BuildRequires: autoconf +BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: bison -BuildRequires: ffmpeg-devel +BuildRequires: ffmpeg-devel < 5 BuildRequires: flac-devel BuildRequires: flex -BuildRequires: fontconfig-devel +BuildRequires: fontconfig-devel >= 2.0.0 BuildRequires: giflib-devel -BuildRequires: gtk+3-devel -BuildRequires: gtkglext-devel +BuildRequires: glew-devel +BuildRequires: glib2-devel >= 2.0 +BuildRequires: gtk+3-devel >= 3.22 BuildRequires: lame-libs-devel -BuildRequires: libieee1284-devel -BuildRequires: libjpeg-devel +%{?with_ieee1284:BuildRequires: libieee1284-devel} +%{?with_openmp:BuildRequires: libgomp-devel} BuildRequires: libmpg123-devel BuildRequires: libogg-devel +BuildRequires: libpcap-devel BuildRequires: libpng-devel -BuildRequires: libstdc++-devel +BuildRequires: libstdc++-devel >= 6:4.7 BuildRequires: libvorbis-devel BuildRequires: linux-libc-headers +%if %{with catweasel} || %{with hardsid} +BuildRequires: pciutils-devel +%endif BuildRequires: perl-base BuildRequires: pkgconfig +BuildRequires: portaudio-devel %{?with_pulseaudio:BuildRequires: pulseaudio-devel} BuildRequires: readline-devel +BuildRequires: rpm-build >= 4.6 BuildRequires: texinfo -BuildRequires: vte-devel BuildRequires: xa -BuildRequires: xorg-app-bdftopcf -BuildRequires: xorg-app-mkfontdir BuildRequires: xorg-lib-libX11-devel -BuildRequires: xorg-lib-libXext-devel -BuildRequires: xorg-lib-libXrandr-devel -BuildRequires: xorg-lib-libXv-devel -BuildRequires: xorg-lib-libXxf86dga-devel -BuildRequires: xorg-lib-libXxf86vm-devel -Requires(post,postun): fontpostinst >= 0.1-6 +BuildRequires: zlib-devel +Requires: fontconfig >= 2.0.0 +Requires: gtk+3 >= 3.22 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -77,75 +87,85 @@ Aktualna wersja emuluje C64, C128 (wraz z trybem pracy 80 kolumnowym), VIC20, wszystkie modele PET (poza SuperPET 9000, który zresztą nie pasował do tej linii), CBM-II (C610) oraz Plus4. +%package doc +Summary: VICE documentation in HTML format +Summary(pl.UTF-8): Dokumentacja do VICE w formacie HTML +Group: Documentation +BuildArch: noarch + +%description doc +VICE documentation in HTML format. + +%description doc -l pl.UTF-8 +Dokumentacja do VICE w formacie HTML. + %prep %setup -q %patch0 -p1 %patch1 -p1 -%{__perl} -i -pe 's@\$\(VICEDIR\)/fonts@%{_fontsdir}/misc@' data/fonts/Makefile.am +%patch2 -p1 +%patch3 -p1 %build %{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} -cd src/resid -%{__autoconf} -cd ../.. export CFLAGS="%{rpmcflags} -fcommon" %configure \ DOS2UNIX=/usr/bin/dos2unix \ - --libdir=%{_datadir} \ + %{?with_catweasel:--enable-catweasel} \ + --enable-ethernet \ + --enable-ffmpeg \ + --enable-gtk3ui \ + %{!?with_hardsid:--disable-hardsid} \ + --enable-lame \ + %{?with_ieee1284:--enable-libieee1284} \ + --enable-midi \ + %{!?with_openmp:--disable-openmp} \ + %{?with_parsid:--enable-parsid} \ + --disable-pdf-docs \ + %{?with_ssi2001:--enable-ssi2001} \ + --enable-x64 \ + --enable-x64-image \ + --with-flac \ + --with-libcurl \ + --with-mpg123 \ + --with-oss \ %{?with_pulseaudio:--with-pulse} \ - --enable-libieee1284 \ - --enable-native-gtk3ui \ --with-sdlsound \ - --enable-external-ffmpeg \ - --enable-ethernet \ - --with-x + --with-vorbis -# contains some C++ code included as "old" library (.a), so libtool can't detect it -%{__make} \ - CCLD="%{__cxx}" +%{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} +install -d $RPM_BUILD_ROOT%{_desktopdir} -%{__perl} -i -pe 's/SUBDIRS = html\n//' doc/Makefile %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - VICEDIR="%{_datadir}/%{name}" - -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/vice/doc -# ? -#ln -sf %{_docdir}/%{name}-%{version}/html $RPM_BUILD_ROOT%{_datadir}/vice/doc + DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir} +cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir} -install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF -mv $RPM_BUILD_ROOT%{_fontsdir}/{misc,TTF}/CBM.ttf +%{__rm} $RPM_BUILD_ROOT%{_docdir}/vice/{*.txt,*.md,vice.texi} %clean rm -rf $RPM_BUILD_ROOT %post -fontpostinst TTF -fontpostinst misc [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 %postun -fontpostinst TTF -fontpostinst misc [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog FEEDBACK NEWS README doc/iec-bus.txt doc/html +%doc NEWS README doc/{CIA-README.txt,iec-bus.txt,readmes/Readme-SDL2.txt} doc/html/fonts/OFL.txt %attr(755,root,root) %{_bindir}/c1541 %attr(755,root,root) %{_bindir}/cartconv %attr(755,root,root) %{_bindir}/petcat @@ -161,11 +181,9 @@ fontpostinst misc %attr(755,root,root) %{_bindir}/xscpu64 %attr(755,root,root) %{_bindir}/xvic %{_datadir}/vice -%{_fontsdir}/misc/vice-cbm.bdf -%{_fontsdir}/TTF/CBM.ttf -%{_mandir}/man1/cartconv.1* -%{_mandir}/man1/c1541.1* -%{_mandir}/man1/petcat.1* -%{_mandir}/man1/vice.1* %{_infodir}/vice.info* %{_desktopdir}/vice-*.desktop + +%files doc +%defattr(644,root,root,755) +%doc doc/html/{fonts,images,*.css,*.html,NEWS,COPYING,favicon.ico,robots.txt}