[packages/vice] - up to 3.3

baggins baggins at pld-linux.org
Sun Oct 20 21:24:42 CEST 2019


commit 1eaa1df600c73cfe3093b383d5c116579edcd397
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Oct 20 21:23:29 2019 +0200

    - up to 3.3

 ffmpeg3.patch       | 158 ----------------------------------------------------
 giflib5.patch       |  20 -------
 perl.patch          |  20 -------
 texinfo.patch       |  11 ----
 vice-ffmpeg.patch   | 129 ------------------------------------------
 vice-fonts.patch    |  11 ++--
 vice-gettext.patch  | 136 --------------------------------------------
 vice-home_etc.patch |  93 -------------------------------
 vice-link.patch     |  40 -------------
 vice.spec           |  70 ++++++++---------------
 10 files changed, 29 insertions(+), 659 deletions(-)
---
diff --git a/vice.spec b/vice.spec
index 723aa48..84987d5 100644
--- a/vice.spec
+++ b/vice.spec
@@ -8,12 +8,12 @@
 Summary:	Versatile Commodore Emulator
 Summary(pl.UTF-8):	Uniwersalny emulator Commodore
 Name:		vice
-Version:	2.4
-Release:	6
+Version:	3.3
+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:	b017647a0c159bbe43cdb81762d1c577
+# Source0-md5:	b0797f534b33f638220418207d606cf5
 Source1:	%{name}-c128.desktop
 Source2:	%{name}-c64.desktop
 Source3:	%{name}-cbm2.desktop
@@ -21,16 +21,8 @@ Source4:	%{name}-pet.desktop
 Source5:	%{name}-plus4.desktop
 Source6:	%{name}-vic20.desktop
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-gettext.patch
-Patch2:		%{name}-home_etc.patch
-Patch3:		%{name}-fonts.patch
-Patch4:		%{name}-link.patch
-Patch5:		%{name}-ffmpeg.patch
-Patch6:		texinfo.patch
-Patch7:		ffmpeg3.patch
-Patch8:		giflib5.patch
-Patch9:		perl.patch
-URL:		http://www.viceteam.org/
+Patch1:		%{name}-fonts.patch
+URL:		http://vice-emu.sourceforge.net/
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	SDL-devel >= 1.2.0
 BuildRequires:	alsa-lib-devel
@@ -38,21 +30,28 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	ffmpeg-devel
+BuildRequires:	flac-devel
 BuildRequires:	flex
-BuildRequires:	gettext-tools
+BuildRequires:	fontconfig-devel
 BuildRequires:	giflib-devel
-BuildRequires:	gtk+2-devel >= 1:2.0
+BuildRequires:	gtk+3-devel
 BuildRequires:	gtkglext-devel
 BuildRequires:	lame-libs-devel
+BuildRequires:	libieee1284-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	libmpg123-devel
+BuildRequires:	libogg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libvorbis-devel
+BuildRequires:	linux-libc-headers
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	readline-devel
 BuildRequires:	texinfo
-BuildRequires:	vte0-devel
+BuildRequires:	vte-devel
+BuildRequires:	xa
 BuildRequires:	xorg-app-bdftopcf
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-lib-libX11-devel
@@ -82,18 +81,9 @@ pasował do tej linii), CBM-II (C610) oraz Plus4.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 %{__perl} -i -pe 's@\$\(VICEDIR\)/fonts@%{_fontsdir}/misc@' data/fonts/Makefile.am
 
 %build
-%{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -102,14 +92,15 @@ cd src/resid
 %{__autoconf}
 cd ../..
 %configure \
+	DOS2UNIX=/usr/bin/dos2unix \
 	--libdir=%{_datadir} \
-	--enable-fullscreen \
-	--enable-gnomeui \
-	--enable-nls \
 	%{?with_pulseaudio:--with-pulse} \
+	--enable-libieee1284 \
+	--enable-native-gtk3ui \
 	--with-sdlsound \
-	--with-x \
-	--without-xaw3d
+	--enable-external-ffmpeg \
+	--enable-ethernet \
+	--with-x
 
 # contains some C++ code included as "old" library (.a), so libtool can't detect it
 %{__make} \
@@ -135,17 +126,9 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
 
-cd src/arch/unix/x11
-for i in *icon.c; do
-	install $i $RPM_BUILD_ROOT%{_pixmapsdir}/${i%.c}.xpm
-done
-cd ../../../..
-
 install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
 mv $RPM_BUILD_ROOT%{_fontsdir}/{misc,TTF}/CBM.ttf
 
-%find_lang %{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -159,7 +142,7 @@ fontpostinst TTF
 fontpostinst misc
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog FEEDBACK NEWS README doc/iec-bus.txt doc/html
 %attr(755,root,root) %{_bindir}/c1541
@@ -174,19 +157,14 @@ fontpostinst misc
 %attr(755,root,root) %{_bindir}/xcbm5x0
 %attr(755,root,root) %{_bindir}/xpet
 %attr(755,root,root) %{_bindir}/xplus4
+%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
-%{_pixmapsdir}/c128icon.xpm
-%{_pixmapsdir}/c64dtvicon.xpm
-%{_pixmapsdir}/c64icon.xpm
-%{_pixmapsdir}/cbm2icon.xpm
-%{_pixmapsdir}/peticon.xpm
-%{_pixmapsdir}/plus4icon.xpm
-%{_pixmapsdir}/vic20icon.xpm
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644
index 8b4aca4..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- vice-2.4/src/gfxoutputdrv/ffmpegdrv.c.orig	2016-10-20 08:39:01.494075298 +0200
-+++ vice-2.4/src/gfxoutputdrv/ffmpegdrv.c	2016-10-20 08:39:21.217744132 +0200
-@@ -46,29 +46,29 @@
- #include "../sounddrv/soundmovie.h"
- 
- static gfxoutputdrv_codec_t avi_audio_codeclist[] = { 
--    { CODEC_ID_MP2, "MP2" },
--    { CODEC_ID_MP3, "MP3" },
--    { CODEC_ID_FLAC, "FLAC" },
--    { CODEC_ID_PCM_S16LE, "PCM uncompressed" },
-+    { AV_CODEC_ID_MP2, "MP2" },
-+    { AV_CODEC_ID_MP3, "MP3" },
-+    { AV_CODEC_ID_FLAC, "FLAC" },
-+    { AV_CODEC_ID_PCM_S16LE, "PCM uncompressed" },
-     { 0, NULL }
- };
- 
- static gfxoutputdrv_codec_t avi_video_codeclist[] = { 
--    { CODEC_ID_MPEG4, "MPEG4 (DivX)" },
--    { CODEC_ID_MPEG1VIDEO, "MPEG1" },
--    { CODEC_ID_FFV1, "FFV1 (lossless)" },
--    { CODEC_ID_H264, "H264" },
--    { CODEC_ID_THEORA, "Theora" },
-+    { AV_CODEC_ID_MPEG4, "MPEG4 (DivX)" },
-+    { AV_CODEC_ID_MPEG1VIDEO, "MPEG1" },
-+    { AV_CODEC_ID_FFV1, "FFV1 (lossless)" },
-+    { AV_CODEC_ID_H264, "H264" },
-+    { AV_CODEC_ID_THEORA, "Theora" },
-     { 0, NULL }
- };
- 
- static gfxoutputdrv_codec_t ogg_audio_codeclist[] = { 
--    { CODEC_ID_FLAC, "FLAC" },
-+    { AV_CODEC_ID_FLAC, "FLAC" },
-     { 0, NULL }
- };
- 
- static gfxoutputdrv_codec_t ogg_video_codeclist[] = { 
--    { CODEC_ID_THEORA, "Theora" },
-+    { AV_CODEC_ID_THEORA, "Theora" },
-     { 0, NULL }
- };
- 
-@@ -201,9 +201,9 @@
-     { "FFMPEGVideoBitrate", VICE_FFMPEG_VIDEO_RATE_DEFAULT,
-       RES_EVENT_NO, NULL,
-       &video_bitrate, set_video_bitrate, NULL },
--    { "FFMPEGAudioCodec", CODEC_ID_MP3, RES_EVENT_NO, NULL,
-+    { "FFMPEGAudioCodec", AV_CODEC_ID_MP3, RES_EVENT_NO, NULL,
-       &audio_codec, set_audio_codec, NULL },
--    { "FFMPEGVideoCodec", CODEC_ID_MPEG4, RES_EVENT_NO, NULL,
-+    { "FFMPEGVideoCodec", AV_CODEC_ID_MPEG4, RES_EVENT_NO, NULL,
-       &video_codec, set_video_codec, NULL },
-     { "FFMPEGVideoHalveFramerate", 0, RES_EVENT_NO, NULL,
-       &video_halve_framerate, set_video_halve_framerate, NULL },
-@@ -278,10 +278,10 @@
-     if (c->frame_size <= 1) {
-         audio_inbuf_samples = audio_outbuf_size;
-         switch(st->codec->codec_id) {
--        case CODEC_ID_PCM_S16LE:
--        case CODEC_ID_PCM_S16BE:
--        case CODEC_ID_PCM_U16LE:
--        case CODEC_ID_PCM_U16BE:
-+        case AV_CODEC_ID_PCM_S16LE:
-+        case AV_CODEC_ID_PCM_S16BE:
-+        case AV_CODEC_ID_PCM_U16LE:
-+        case AV_CODEC_ID_PCM_U16BE:
-             audio_inbuf_samples >>= 1;
-             break;
-         default:
-@@ -326,7 +326,7 @@
- 
-     audio_init_done = 1;
- 
--    if (ffmpegdrv_fmt->audio_codec == CODEC_ID_NONE)
-+    if (ffmpegdrv_fmt->audio_codec == AV_CODEC_ID_NONE)
-         return -1;
- 
-     *audio_in = &ffmpegdrv_audio_in;
-@@ -496,8 +496,8 @@
-        picture is needed too. It is then converted to the required
-        output format */
-     tmp_picture = NULL;
--    if (c->pix_fmt != PIX_FMT_RGB24) {
--        tmp_picture = ffmpegdrv_alloc_picture(PIX_FMT_RGB24, 
-+    if (c->pix_fmt != AV_PIX_FMT_RGB24) {
-+        tmp_picture = ffmpegdrv_alloc_picture(AV_PIX_FMT_RGB24, 
-                                                 c->width, c->height);
-         if (!tmp_picture) {
-             log_debug("ffmpegdrv: could not allocate temporary picture");
-@@ -548,7 +548,7 @@
- 
-      video_init_done = 1;
- 
--     if (ffmpegdrv_fmt->video_codec == CODEC_ID_NONE)
-+     if (ffmpegdrv_fmt->video_codec == AV_CODEC_ID_NONE)
-         return;
- 
-     st = (*ffmpeglib.p_av_new_stream)(ffmpegdrv_oc, 0);
-@@ -573,23 +573,23 @@
-     }
-     c->time_base.num = 1;
-     c->gop_size = 12; /* emit one intra frame every twelve frames at most */
--    c->pix_fmt = PIX_FMT_YUV420P;
-+    c->pix_fmt = AV_PIX_FMT_YUV420P;
- 
-     /* Avoid format conversion which would lead to loss of quality */
--    if (c->codec_id == CODEC_ID_FFV1) {
--        c->pix_fmt = PIX_FMT_RGB32;
-+    if (c->codec_id == AV_CODEC_ID_FFV1) {
-+        c->pix_fmt = AV_PIX_FMT_RGB32;
-     }
- 
-     /* Use XVID instead of FMP4 FOURCC for better compatibility */
--    if (c->codec_id == CODEC_ID_MPEG4) {
-+    if (c->codec_id == AV_CODEC_ID_MPEG4) {
-         c->codec_tag = MKTAG('X','V','I','D');
-     }
- 
- #ifdef HAVE_FFMPEG_SWSCALE
-     /* setup scaler */
--    if (c->pix_fmt != PIX_FMT_RGB24) {
-+    if (c->pix_fmt != AV_PIX_FMT_RGB24) {
-         sws_ctx = (*ffmpeglib.p_sws_getContext)
--            (video_width, video_height, PIX_FMT_RGB24, 
-+            (video_width, video_height, AV_PIX_FMT_RGB24, 
-              video_width, video_height, c->pix_fmt, 
-              SWS_BICUBIC, 
-              NULL, NULL, NULL);
-@@ -794,7 +794,7 @@
- 
-     c = video_st->codec;
- 
--    if (c->pix_fmt != PIX_FMT_RGB24) {
-+    if (c->pix_fmt != AV_PIX_FMT_RGB24) {
-         ffmpegdrv_fill_rgb_image(screenshot, tmp_picture);
- #ifdef HAVE_FFMPEG_SWSCALE
-         if (sws_ctx != NULL) {
-@@ -804,7 +804,7 @@
-         }
- #else
-         (*ffmpeglib.p_img_convert)((AVPicture *)picture, c->pix_fmt,
--                    (AVPicture *)tmp_picture, PIX_FMT_RGB24,
-+                    (AVPicture *)tmp_picture, AV_PIX_FMT_RGB24,
-                     c->width, c->height);
- #endif
-     } else {
---- vice-2.4/src/gfxoutputdrv/ffmpeglib.h.orig	2016-10-20 08:42:01.130057414 +0200
-+++ vice-2.4/src/gfxoutputdrv/ffmpeglib.h	2016-10-20 08:42:13.940218343 +0200
-@@ -95,7 +95,7 @@
- #ifdef HAVE_FFMPEG_SWSCALE
- /* swscale functions */
- typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
--  enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat,
-+  enum AVPixelFormat srcFormat, int dstW, int dstH, enum AVPixelFormat dstFormat,
-   int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
- typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
- typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* srcSlice[],
diff --git a/giflib5.patch b/giflib5.patch
deleted file mode 100644
index 1358d95..0000000
--- a/giflib5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vice-2.4/src/gfxoutputdrv/gifdrv.c~	2012-07-26 01:46:05.000000000 +0200
-+++ vice-2.4/src/gfxoutputdrv/gifdrv.c	2016-10-20 08:43:09.037546871 +0200
-@@ -114,7 +114,7 @@
-   if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
-       EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
-   {
--    EGifCloseFile(sdata->fd);
-+    EGifCloseFile(sdata->fd, NULL);
-     VICE_FreeMapObject(gif_colors);
-     lib_free(sdata->data);
-     lib_free(sdata->ext_filename);
-@@ -145,7 +145,7 @@
- 
-     sdata = screenshot->gfxoutputdrv_data;
- 
--    EGifCloseFile(sdata->fd);
-+    EGifCloseFile(sdata->fd, NULL);
-     VICE_FreeMapObject(gif_colors);
- 
-     /* for some reason giflib will create a file with unexpected
diff --git a/perl.patch b/perl.patch
deleted file mode 100644
index 6b9697f..0000000
--- a/perl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vice-2.4/doc/html/texi2html~	2008-03-30 17:04:15.000000000 +0200
-+++ vice-2.4/doc/html/texi2html	2016-10-20 08:58:42.902422283 +0200
-@@ -1557,7 +1557,7 @@
-     $level--; # here we start at 0
-     if ($name =~ /^appendix/) {
- 	# appendix style
--	if (defined(@appendix_sec_num)) {
-+	if (@appendix_sec_num) {
- 	    &incr_sec_num($level, @appendix_sec_num);
- 	} else {
- 	    @appendix_sec_num = ('A', 0, 0, 0);
-@@ -1565,7 +1565,7 @@
- 	return(join('.', @appendix_sec_num[0..$level]));
-     } else {
- 	# normal style
--	if (defined(@normal_sec_num)) {
-+	if (@normal_sec_num) {
- 	    &incr_sec_num($level, @normal_sec_num);
- 	} else {
- 	    @normal_sec_num = (1, 0, 0, 0);
diff --git a/texinfo.patch b/texinfo.patch
deleted file mode 100644
index b72186d..0000000
--- a/texinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vice-2.4/doc/vice.texi~	2013-11-08 07:48:55.000000000 +0100
-+++ vice-2.4/doc/vice.texi	2013-11-08 07:58:08.473687303 +0100
-@@ -8245,7 +8245,7 @@
- @item -Crtcextpal
- Use an external palette (file)
- @cindex -Crtcpalette
-- at itemx -Crtcpalette NAME
-+ at item -Crtcpalette NAME
- Specify @code{NAME} as the palette file (@code{CrtcPaletteFile}).
- @cindex -Crtcfulldevice
- @item -Crtcfulldevice <device>
diff --git a/vice-ffmpeg.patch b/vice-ffmpeg.patch
deleted file mode 100644
index 0b77d12..0000000
--- a/vice-ffmpeg.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- vice-2.4/src/gfxoutputdrv/ffmpeglib.h.orig	2011-10-24 21:06:48.000000000 +0200
-+++ vice-2.4/src/gfxoutputdrv/ffmpeglib.h	2012-11-25 13:09:18.518868503 +0100
-@@ -70,7 +70,7 @@
- /* avcodec fucntions */
- typedef int (*avcodec_open_t) (AVCodecContext*, AVCodec*);
- typedef int (*avcodec_close_t) (AVCodecContext*);
--typedef AVCodec* (*avcodec_find_encoder_t) (enum CodecID);
-+typedef AVCodec* (*avcodec_find_encoder_t) (enum AVCodecID);
- typedef int (*avcodec_encode_audio_t) (AVCodecContext*, uint8_t*, int, const short*);
- typedef int (*avcodec_encode_video_t) (AVCodecContext*, uint8_t*, int, const AVFrame*);
- typedef int (*avpicture_fill_t) (AVPicture*, uint8_t*, int, int, int);
-@@ -80,12 +80,11 @@ typedef int (*avpicture_get_size_t) (int
- typedef void (*av_init_packet_t) (AVPacket *pkt);
- typedef void (*av_register_all_t) (void);
- typedef AVStream* (*av_new_stream_t) (AVFormatContext*, int);
--typedef int (*av_set_parameters_t) (AVFormatContext*, AVFormatParameters*);
--typedef int (*av_write_header_t) (AVFormatContext*);
-+typedef int (*avformat_write_header_t) (AVFormatContext*, AVDictionary **);
- typedef int (*av_write_frame_t) (AVFormatContext*, AVPacket*);
- typedef int (*av_write_trailer_t) (AVFormatContext*);
--typedef int (*url_fopen_t) (ByteIOContext**, const char*, int);
--typedef int (*url_fclose_t) (ByteIOContext*);
-+typedef int (*avio_open_t) (AVIOContext**, const char*, int);
-+typedef int (*avio_close_t) (AVIOContext*);
- typedef void (*dump_format_t) (AVFormatContext *, int, const char*, int);
- typedef AVOutputFormat* (*av_guess_format_t) (const char*, const char*, const char*);
- typedef int (*img_convert_t) (AVPicture*, int, AVPicture*, int, int, int);
-@@ -118,12 +117,11 @@ struct ffmpeglib_s {
-     av_init_packet_t            p_av_init_packet;
-     av_register_all_t           p_av_register_all;
-     av_new_stream_t             p_av_new_stream;
--    av_set_parameters_t         p_av_set_parameters;
--    av_write_header_t           p_av_write_header;
-+    avformat_write_header_t     p_avformat_write_header;
-     av_write_frame_t            p_av_write_frame;
-     av_write_trailer_t          p_av_write_trailer;
--    url_fopen_t                 p_url_fopen;
--    url_fclose_t                p_url_fclose;
-+    avio_open_t                 p_avio_open;
-+    avio_close_t                p_avio_close;
-     dump_format_t               p_dump_format;
-     av_guess_format_t           p_av_guess_format;
- #ifndef HAVE_FFMPEG_SWSCALE
---- vice-2.4/src/gfxoutputdrv/ffmpegdrv.c.orig	2012-02-13 20:31:44.000000000 +0100
-+++ vice-2.4/src/gfxoutputdrv/ffmpegdrv.c	2012-11-25 13:10:46.712199998 +0100
-@@ -343,7 +343,7 @@ static int ffmpegmovie_init_audio(int sp
-     c = st->codec;
-     c->codec_id = ffmpegdrv_fmt->audio_codec;
-     c->codec_type = AVMEDIA_TYPE_AUDIO;
--    c->sample_fmt = SAMPLE_FMT_S16;
-+    c->sample_fmt = AV_SAMPLE_FMT_S16;
- 
-     /* put sample parameters */
-     c->bit_rate = audio_bitrate;
-@@ -613,11 +613,6 @@ static int ffmpegdrv_init_file(void)
-     if (!video_init_done || !audio_init_done)
-         return 0;
- 
--    if ((*ffmpeglib.p_av_set_parameters)(ffmpegdrv_oc, NULL) < 0) {
--        log_debug("ffmpegdrv: Invalid output format parameters");
--            return -1;
--    }
--
-     (*ffmpeglib.p_dump_format)(ffmpegdrv_oc, 0, ffmpegdrv_oc->filename, 1);
- 
-     if (video_st && (ffmpegdrv_open_video(ffmpegdrv_oc, video_st) < 0)) {
-@@ -632,8 +627,8 @@ static int ffmpegdrv_init_file(void)
-     }
- 
-     if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) {
--        if ((*ffmpeglib.p_url_fopen)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename,
--                            URL_WRONLY) < 0) 
-+        if ((*ffmpeglib.p_avio_open)(&ffmpegdrv_oc->pb, ffmpegdrv_oc->filename,
-+                            AVIO_FLAG_WRITE) < 0) 
-         {
-             ui_error(translate_text(IDGS_FFMPEG_CANNOT_OPEN_S), ffmpegdrv_oc->filename);
-             screenshot_stop_recording();
-@@ -642,7 +637,7 @@ static int ffmpegdrv_init_file(void)
- 
-     }
- 
--    (*ffmpeglib.p_av_write_header)(ffmpegdrv_oc);
-+    (*ffmpeglib.p_avformat_write_header)(ffmpegdrv_oc, NULL);
- 
-     log_debug("ffmpegdrv: Initialized file successfully");
- 
-@@ -724,7 +719,7 @@ static int ffmpegdrv_close(screenshot_t
-         (*ffmpeglib.p_av_write_trailer)(ffmpegdrv_oc);
-         if (!(ffmpegdrv_fmt->flags & AVFMT_NOFILE)) {
-             /* close the output file */
--            (*ffmpeglib.p_url_fclose)(ffmpegdrv_oc->pb);
-+            (*ffmpeglib.p_avio_close)(ffmpegdrv_oc->pb);
-         }
-     }
-     
---- vice-2.4/src/gfxoutputdrv/ffmpeglib.c.orig	2011-09-18 15:09:45.000000000 +0200
-+++ vice-2.4/src/gfxoutputdrv/ffmpeglib.c	2012-11-25 13:11:58.342198505 +0100
-@@ -208,12 +208,11 @@ static int load_avformat(ffmpeglib_t *li
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_init_packet);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_register_all);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_new_stream);
--        GET_SYMBOL_AND_TEST_AVFORMAT(av_set_parameters);
--        GET_SYMBOL_AND_TEST_AVFORMAT(av_write_header);
-+        GET_SYMBOL_AND_TEST_AVFORMAT(avformat_write_header);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_write_frame);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_write_trailer);
--        GET_SYMBOL_AND_TEST_AVFORMAT(url_fopen);
--        GET_SYMBOL_AND_TEST_AVFORMAT(url_fclose);
-+        GET_SYMBOL_AND_TEST_AVFORMAT(avio_open);
-+        GET_SYMBOL_AND_TEST_AVFORMAT(avio_close);
-         GET_SYMBOL_AND_TEST_AVFORMAT(dump_format);
-         GET_SYMBOL_AND_TEST_AVFORMAT(av_guess_format);
- #ifndef HAVE_FFMPEG_SWSCALE
-@@ -240,12 +239,11 @@ static void free_avformat(ffmpeglib_t *l
-     lib->p_av_init_packet = NULL;
-     lib->p_av_register_all = NULL;
-     lib->p_av_new_stream = NULL;
--    lib->p_av_set_parameters = NULL;
--    lib->p_av_write_header = NULL;
-+    lib->p_avformat_write_header = NULL;
-     lib->p_av_write_frame = NULL;
-     lib->p_av_write_trailer = NULL;
--    lib->p_url_fopen = NULL;
--    lib->p_url_fclose = NULL;
-+    lib->p_avio_open = NULL;
-+    lib->p_avio_close = NULL;
-     lib->p_dump_format = NULL;
-     lib->p_av_guess_format = NULL;
- #ifndef HAVE_FFMPEG_SWSCALE
diff --git a/vice-fonts.patch b/vice-fonts.patch
index cb39c8a..7a1fe43 100644
--- a/vice-fonts.patch
+++ b/vice-fonts.patch
@@ -1,6 +1,6 @@
 --- 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,21 +6,3 @@
+@@ -6,20 +6,3 @@
  
  EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon 
  
@@ -17,8 +17,7 @@
 - at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	else \
 - at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	  echo 'fc-cache not available... giving up.' ; \
 - at HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@	fi
-- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	@echo "Preparing fontdir..." ; \
-- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	cd $(DESTDIR)$(fontsdir) ; \
-- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
-- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	rm vice-cbm.bdf ; \
-- at HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@	mkfontdir .
+- at SDL_COMPILE_FALSE@	@echo "Preparing fontdir..." ; \
+- at SDL_COMPILE_FALSE@	cd $(DESTDIR)$(fontsdir) ; \
+- at SDL_COMPILE_FALSE@	bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
+- at SDL_COMPILE_FALSE@	${MKFONTDIR_BIN} .
diff --git a/vice-gettext.patch b/vice-gettext.patch
deleted file mode 100644
index 1ea5280..0000000
--- a/vice-gettext.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- vice-1.21/configure.in~	2007-07-06 20:08:39.000000000 +0200
-+++ vice-1.21/configure.in	2007-07-06 20:11:54.000000000 +0200
-@@ -418,129 +418,10 @@
- dnl Add new languages here
- ALL_LINGUAS="de fr it sv pl nl hu"
- 
--dnl These rules are solely for the distribution goal.  While doing this
--dnl we only have to keep exactly one list of the available catalogs
--dnl in configure.in.
--for lang in $ALL_LINGUAS; do
--  GMOFILES="$GMOFILES $lang.gmo"
--  POFILES="$POFILES $lang.po"
--done
--AC_SUBST(GMOFILES)
--AC_SUBST(POFILES)
--
--if test x"$enable_nls" != "xno" -a x"$is_unix" = "xyes"; then
--  AC_CHECK_HEADER(libintl.h,
--    [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
--      [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
--  	 gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
--
--     AC_CACHE_CHECK([for gettext in libintl], gt_cv_func_gettext_libintl,
--      [save_libs="$LIBS"
--       LIBS="-lintl $LIBS"
--       AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
--  	 INTLLIBS=-lintl gt_cv_func_gettext_libintl=yes, gt_cv_func_gettext_libintl=no)
--       LIBS="$save_libs"])
--
--     if test "$gt_cv_func_gettext_libc" = "yes" \
--  	|| test "$gt_cv_func_gettext_libintl" = "yes"; then
--  	AC_DEFINE(HAVE_GETTEXT,,[Define if gettext if available.])
--  	AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
--  	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
--  	if test "$MSGFMT" != "no"; then
--  	  AC_CHECK_FUNCS(dcgettext)
--  	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--  	  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
--  	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
--  	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
--  			 return _nl_msg_cat_cntr],
--  	    [CATOBJEXT=.gmo
--  	     DATADIRNAME=share],
--  	    [CATOBJEXT=.mo
--  	     DATADIRNAME=lib])
--  	  INSTOBJEXT=.mo
--  	fi
--        USE_NLS=yes
--	AC_DEFINE(ENABLE_NLS,,[Define if NLS support is enabled.])
--	AC_DEFINE(HAVE_LIBINTL_H,,[use libintl for NLS.])
--	AC_DEFINE_UNQUOTED(DATADIRNAME, "$DATADIRNAME",[NLS datadirname.])
--	dnl this is prefixed with PREFIX
--	AC_DEFINE(NLS_LOCALEDIR, PREFIX"/"DATADIRNAME"/locale",[NLS local directory.])
--      else
--        AC_MSG_WARN([libintl.h not found, disabling NLS])
--        USE_NLS=no
--      fi
--  ])
--  dnl Test whether we really found GNU xgettext.
--  if test "$XGETTEXT" != ":"; then
--    dnl If it is no GNU xgettext we define it as : so that the
--    dnl Makefiles still can work.
--    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
--      : ;
--    else
--      AC_MSG_RESULT(
--    	[found xgettext program is not GNU xgettext; ignore it])
--      XGETTEXT=":"
--    fi
--  fi
--
--  dnl Test wether GMSGFMT is there. Should fix `make dist'.
--  if test "$GMSGFMT" = "" ; then
--    GMSGFMT=":"
--  fi
--
--  # We need to process the po/ directory.
--  POSUB=po
--  
--  AC_OUTPUT_COMMANDS(
--    [case "$CONFIG_FILES" in *po/Makefile.in*)
--      sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
--    esac])
--  
--  dnl Make all variables we use known to autoconf.
--  AC_SUBST(USE_INCLUDED_LIBINTL)
--  AC_SUBST(CATALOGS)
--  AC_SUBST(DATADIRNAME)
--  AC_SUBST(INSTOBJEXT)
--  AC_SUBST(INTLDEPS)
--  AC_SUBST(INTLLIBS)
--  AC_SUBST(INTLOBJS)
--  AC_SUBST(POSUB)
--  AC_SUBST(GENCAT)
--
--  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
--  dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
--  dnl Try to locate is.
--  MKINSTALLDIRS=
--  if test -n "$ac_aux_dir"; then
--    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
--  fi
--  if test -z "$MKINSTALLDIRS"; then
--    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
--  fi
--  AC_SUBST(MKINSTALLDIRS)
--
--  dnl currently no catgets support, can't check it.
--  GENCAT=
--  AC_SUBST(GENCAT)
--else
--  if test x"$is_unix" = "xyes"; then
--    AC_MSG_WARN([disabling NLS on user request])
--  fi
--  USE_NLS=no
--fi
--
--if test x"$USE_NLS" = "x" ; then
--  USE_NLS=no
--fi
--if test "$MSGFMT" = "no" ; then
--  dnl Fallback to shipped .gmo 
--  dnl Those should work on x86 linux systems.
--  AC_MSG_WARN([msgfmt not found, falling back to default catalogs (x86/Linux)])
--  CATOBJEXT=".gmo"
--fi
--AC_SUBST(CATOBJEXT)
--AC_SUBST(USE_NLS)
--AC_SUBST(NLS_LOCALEDIR)
-+AM_GNU_GETTEXT
-+AC_CHECK_HEADERS(libintl.h)
-+AC_DEFINE_UNQUOTED(DATADIRNAME, "$DATADIRNAME",[NLS datadirname.])
-+AC_DEFINE(NLS_LOCALEDIR, PREFIX"/"DATADIRNAME"/locale",[NLS local directory.])
- 
- dnl Check for a perl interpreter.
- AC_PATH_PROG(PERL, perl)
diff --git a/vice-home_etc.patch b/vice-home_etc.patch
deleted file mode 100644
index 11316df..0000000
--- a/vice-home_etc.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- vice-2.2/src/arch/unix/archdep.h~	2009-10-21 18:46:46.000000000 +0200
-+++ vice-2.2/src/arch/unix/archdep.h	2010-03-11 11:51:47.773489033 +0100
-@@ -114,7 +114,7 @@
- #define ARCHDEP_KEYBOARD_SYM_NONE 0
- #endif
- 
--extern const char *archdep_home_path(void);
-+extern const char *archdep_home_etc_path(void);
- 
- /* set this path to customize the preference storage */ 
- extern const char *archdep_pref_path;
---- vice-2.2/src/arch/unix/gui/uicommands.c~	2009-10-21 18:46:40.000000000 +0200
-+++ vice-2.2/src/arch/unix/gui/uicommands.c	2010-03-11 11:53:07.350154527 +0100
-@@ -296,7 +296,7 @@
- 
- static UI_CALLBACK(load_quicksnap)
- {
--    char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
-+    char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
- 
-     if (!ui_emulation_is_paused()) {
-         interrupt_maincpu_trigger_trap(load_snapshot_trap, (void *)fname);
-@@ -328,7 +328,7 @@
- 
- static UI_CALLBACK(save_quicksnap)
- {
--    char *fname = util_concat(archdep_home_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
-+    char *fname = util_concat(archdep_home_etc_path(), "/", VICEUSERDIR, "/", machine_name, ".vsf", NULL);
- 
-     interrupt_maincpu_trigger_trap(save_snapshot_trap, (void *)fname);
- }
---- vice-2.3/src/arch/unix/archdep.c~	2010-10-24 06:12:37.000000000 +0200
-+++ vice-2.3/src/arch/unix/archdep.c	2011-03-23 12:15:18.370096657 +0100
-@@ -151,6 +151,14 @@
-     return home;
- }
- 
-+extern const char *archdep_home_etc_path(void)
-+{
-+	char *home_etc = getenv("HOME_ETC");
-+
-+	if (home_etc) return home_etc;
-+	return archdep_home_path();
-+}
-+
- char *archdep_default_sysfile_pathlist(const char *emu_id)
- {
-     static char *default_path;
-@@ -164,7 +172,7 @@
-         const char *home_path;
- 
-         boot_path = archdep_boot_path();
--        home_path = archdep_home_path();
-+        home_path = archdep_home_etc_path();
- 
-         /* First search in the `LIBDIR' then the $HOME/.vice/ dir (home_path)
-            and then in the `boot_path'.  */
-@@ -230,7 +238,7 @@
-     if (archdep_pref_path == NULL) {
-         const char *home;
-       
--        home = archdep_home_path();
-+        home = archdep_home_etc_path();
-         return util_concat(home, "/.vice/vicerc", NULL);
-     } else {
-         return util_concat(archdep_pref_path, "/vicerc", NULL);
-@@ -242,7 +250,7 @@
-     if (archdep_pref_path == NULL) {
-         const char *home;
- 
--        home = archdep_home_path();
-+        home = archdep_home_etc_path();
-         return util_concat(home, "/.vice/fliplist-", machine_get_name(), ".vfl", NULL);
-     } else {
-         return util_concat(archdep_pref_path, "/fliplist-", machine_get_name(), ".vfl", NULL);
-@@ -254,7 +262,7 @@
-     if (archdep_pref_path == NULL) {
-         const char *home;
- 
--        home = archdep_home_path();
-+        home = archdep_home_etc_path();
-         return util_concat(home, "/.vice/autostart-", machine_get_name(), ".d64", NULL);
-     } else {
-         return util_concat(archdep_pref_path, "/autostart-", machine_get_name(), ".d64", NULL);
-@@ -268,7 +276,7 @@
-     const char *viceuserdir;
- 
-     if (archdep_pref_path == NULL) {
--        home = archdep_home_path();
-+        home = archdep_home_etc_path();
-         viceuserdir = util_concat(home, "/.vice", NULL);
-     } else {
-         viceuserdir = archdep_pref_path;
diff --git a/vice-link.patch b/vice-link.patch
deleted file mode 100644
index adea3bf..0000000
--- a/vice-link.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- vice-2.4/configure.in.orig	2012-11-25 10:36:26.562393010 +0100
-+++ vice-2.4/configure.in	2012-11-25 10:41:56.032386143 +0100
-@@ -1279,22 +1279,6 @@
- 
-   if test x"$UNIX_NETWORK_HEADERS_PRESENT" = "xyes"; then
- 
--    dnl Check for possible extra needed network libraries
--    AC_CHECK_LIB(intl, dgettext,[ NETPLAY_LIBS="-lintl $NETPLAY_LIBS";
--                                  LIBS="-lintl $LIBS"],,)
--    AC_CHECK_LIB(nsl, gethostbyname,[ NETPLAY_LIBS="-lnsl $NETPLAY_LIBS";
--                                      LIBS="-lnsl $LIBS"],,)
--    AC_CHECK_LIB(socket, gethostbyname,[ NETPLAY_LIBS="-lsocket $NETPLAY_LIBS";
--                                         LIBS="-lsocket $LIBS"],,)
--    AC_CHECK_LIB(bsd, gethostbyname,[ NETPLAY_LIBS="-lbsd $NETPLAY_LIBS";
--                                      LIBS="-lbsd $LIBS"],,)
--    AC_CHECK_LIB(net, gethostbyname,[ NETPLAY_LIBS="-lnet $NETPLAY_LIBS";
--                                      LIBS="-lnet $LIBS"],,)
--    AC_CHECK_LIB(inet, gethostbyname,[ NETPLAY_LIBS="-linet $NETPLAY_LIBS";
--                                       LIBS="-linet $LIBS"],,)
--    AC_CHECK_LIB(watt, gethostbyname,[ NETPLAY_LIBS="-lwatt $NETPLAY_LIBS";
--                                       LIBS="-lwatt $LIBS"],,)
--
-     dnl Check for needed functions
-     UNIX_NETWORK_FUNCS_PRESENT=yes
- 
-@@ -2426,14 +2410,6 @@
-     AC_CHECK_LIB(intl, dgettext,[ X_LIBS="-lintl $X_LIBS";
-                  LINK_X_LIBS="-lintl $LINK_X_LIBS"],,$X_LIBS)
- 
--    dnl instead of assuming that libsocket needs libnsl, we
--    dnl will check the existance of libnsl first.
--    AC_CHECK_LIB(nsl, gethostbyname,[ X_LIBS="-lnsl $X_LIBS";
--                 LINK_X_LIBS="-lnsl $LINK_X_LIBS"],,$X_LIBS)
--    AC_CHECK_LIB(socket, gethostbyname,[ X_LIBS="-lsocket $X_LIBS";
--                 LINK_X_LIBS="-lsocket $LINK_X_LIBS"],,$X_LIBS)
--    AC_CHECK_LIB(bsd, gethostbyname,[ X_LIBS="-lbsd $X_LIBS";
--                 LINK_X_LIBS="-lbsd $LINK_X_LIBS"],,$X_LIBS)
-     if test x"$ac_cv_lib_ICE_IceConnectionNumber" != "xyes"; then
-       unset ac_cv_lib_ICE_IceConnectionNumber
-     fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vice.git/commitdiff/1eaa1df600c73cfe3093b383d5c116579edcd397



More information about the pld-cvs-commit mailing list