commit 87c2fd3955bfac45119b8d75113fe61d8dcb8b68
Author: Jan Rękorajski <[email protected]>
Date: Fri Nov 8 08:00:56 2013 +0100
- fix build with ffmpeg 2
- fix texi for texinfo 5.x
- rel 3
texinfo.patch | 11 +++++++++++
vice-ffmpeg.patch | 9 +++++++++
vice.spec | 4 +++-
3 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/vice.spec b/vice.spec
index 7e264c2..73cd202 100644
--- 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
diff --git a/texinfo.patch b/texinfo.patch
new file mode 100644
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 1198f5e..0b77d12 100644
--- 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vice.git/commitdiff/87c2fd3955bfac45119b8d75113fe61d8dcb8b68
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
