- fix build with ffmpeg 2

- fix texi for texinfo 5.x
- rel 3

diff --git a/texinfo.patch b/texinfo.patch
new file mode 100644 (file)
index 0000000..b72186d
--- /dev/null
+++ b/texinfo.patch
@@ -0,0 +1,11 @@
+--- 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
+-@itemx -Crtcpalette NAME
++@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
index 1198f5ea799196310b3a55cbe5bc0349b6d3e7e2..0b77d127e8b16893128d4f0ef535b38d3083b0a3 100644 (file)
--- a/vice-ffmpeg.patch
+++ b/vice-ffmpeg.patch
@@ -1,5 +1,14 @@
 --- 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);

diff --git a/vice.spec b/vice.spec
index 7e264c23820fec20a9d7d74e0b1069ab7b7e87fe..73cd202c0a4896d0f2969ddf27f25470f3d11be4 100644 (file)
--- a/vice.spec
+++ b/vice.spec
@@ -9,7 +9,7 @@ Summary:        Versatile Commodore Emulator
 Summary(pl.UTF-8):     Uniwersalny emulator Commodore
 Name:          vice
 Version:       2.4
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Applications/Emulators
 Source0:       http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@ Patch2:               %{name}-home_etc.patch
 Patch3:                %{name}-fonts.patch
 Patch4:                %{name}-link.patch
 Patch5:                %{name}-ffmpeg.patch
+Patch6:                texinfo.patch
 URL:           http://www.viceteam.org/
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: SDL-devel >= 1.2.0
@@ -82,6 +83,7 @@ pasował do tej linii), CBM-II (C610) oraz Plus4.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %{__perl} -i -pe 's@\$\(VICEDIR\)/fonts@%{_fontsdir}/misc@' data/fonts/Makefile.am
 
 %build