Removed obsolete stuff
This commit is contained in:
parent
9f970a603a
commit
4adf33c299
@ -1,7 +0,0 @@
|
|||||||
AUX vice-2.4.27-autotools.patch 353 SHA256 5d9232698424a6c98ed27e3206fb46a12093666e42dd6a59b21fd362923e9511 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 WHIRLPOOL cad09cca9eb43298168ff4c8f3c5acd52e56aeee1a3db63f91906c5f4dc440f230d3e2e68c039759fbea0e5d7bb54adec58c2c14fe4be41a75e69c1a0fe35ab6
|
|
||||||
AUX vice-2.4.27-ffmpeg3.patch 2537 SHA256 d42963d9051096c59ecdffbf5fb52c43fff13e0f749925bb6189a105cd1344ac SHA512 7d1933038fd34fe598bccfb3762777dac7b4dad4cdea44cf27e4a124c7a7917580069fb0fe950f81c5aa00157f0ac3f84dba7fea60f46f7a52f7b6e917b2e050 WHIRLPOOL d3f611fe58116ecc57cd89f771b17bece1e7d91261fa416657aefd550ecade1a05a68502d670f66ccd9b74f200b6c6512a9ef5c489e153767e6084e0cdfa5c8a
|
|
||||||
DIST vice-2.4.27.tar.gz 25561665 SHA256 ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec WHIRLPOOL 44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406
|
|
||||||
DIST vice-3.1.tar.gz 30714226 SHA256 3eb8159633816095006dec36c5c3edd055a87fd8bda193a1194a6801685d1240 SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579 WHIRLPOOL ff5f8591b3c9b66b739fc7403606d3a30a3b87740826ea5e05d518eedcde83fe5ff78fdb4ad606ad6eefe1c2419f3e6141b5a4c792c5b9082209f7a8f68053dc
|
|
||||||
EBUILD vice-2.4.27-r3.ebuild 4198 SHA256 8c29d3707d75c60a8ddf05c55ae245121953b770d6dbb112bc95b329cca1d61e SHA512 9cf915b527228e832ac2be037441468fb0bb437667f064de763b9976f6db2793608080828252c4dcf0d1973becc9c172fd6663e41f2caf827d0c07c661a3b155 WHIRLPOOL ee9420c312b0a9fcebeb459bb8cf66635e7a7f17d399e13e0d005f1921671dd6cdad8eba871bb3579894d6b61e8da347d066cf07d9a9af7f364d43572c834b31
|
|
||||||
EBUILD vice-3.1.ebuild 4046 SHA256 c722725793d396d9d183ab964848a793b223bcf902773f624eb6a1276b48e8c7 SHA512 b5f2a530ba6edbed6f9cc710041405e89248a6611b152de27e29bf76e30bdb84bafc5fbdacd221366bf7b45ff361a0dcc5ba9e1c99c3fb81fe3b97e60f3090e9 WHIRLPOOL 91c1ff8b43bbbbe77d65f70499caef85e593772824fb6143ea243716fc33c84e595fa58268f9cb3acc4c394fd2ad1118903073b6324e05a7d4a880344dee377e
|
|
||||||
MISC metadata.xml 646 SHA256 44d02a16c320326481162dd62b212494bb0083198dd7f5999498bcd519f0ec04 SHA512 1d641f0e1ba5962aa7b9e230c20ade01595aed9f853be25ec4d5022aff22cbd75414a41fbf64427bf5a27485057ee3e767521561f396a5bf70ffa3e1da31739f WHIRLPOOL 64a43a1df92e8a1be6c0b16a61b5ddf3ad4f0f60e0f1f68bde92785a9369b9b2957ac4b9234736cbed8743d57804af6ce082ed66709d327f99dbacb4fe24039b
|
|
@ -1,11 +0,0 @@
|
|||||||
--- vice-2.4.7.orig/configure.ac
|
|
||||||
+++ vice-2.4.7/configure.ac
|
|
||||||
@@ -124,7 +118,7 @@
|
|
||||||
AC_SUBST(VICE_VERSION)
|
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE(vice, $VICE_VERSION)
|
|
||||||
-AM_CONFIG_HEADER(src/config.h)
|
|
||||||
+AC_CONFIG_HEADERS(src/config.h)
|
|
||||||
|
|
||||||
if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
|
|
||||||
VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0"
|
|
@ -1,60 +0,0 @@
|
|||||||
--- a/src/gfxoutputdrv/ffmpeglib.h
|
|
||||||
+++ b/src/gfxoutputdrv/ffmpeglib.h
|
|
||||||
@@ -76,6 +76,14 @@
|
|
||||||
#define AVCodecID CodecID
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(55,17,103)
|
|
||||||
+#define VICE_AV_PIX_FMT_RGB24 PIX_FMT_RGB24
|
|
||||||
+#define VICE_AV_PixelFormat PixelFormat
|
|
||||||
+#else
|
|
||||||
+#define VICE_AV_PIX_FMT_RGB24 AV_PIX_FMT_RGB24
|
|
||||||
+#define VICE_AV_PixelFormat AVPixelFormat
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* avcodec fucntions */
|
|
||||||
typedef void(*av_init_packet_t)(AVPacket *pkt);
|
|
||||||
typedef int(*avcodec_open2_t)(AVCodecContext*, AVCodec*, AVDictionary **);
|
|
||||||
@@ -118,7 +126,7 @@
|
|
||||||
|
|
||||||
/* swscale functions */
|
|
||||||
typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
|
|
||||||
- enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat,
|
|
||||||
+ enum VICE_AV_PixelFormat srcFormat, int dstW, int dstH, enum VICE_AV_PixelFormat 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[],
|
|
||||||
--- a/src/gfxoutputdrv/ffmpegdrv.c
|
|
||||||
+++ b/src/gfxoutputdrv/ffmpegdrv.c
|
|
||||||
@@ -671,8 +671,8 @@
|
|
||||||
picture is needed too. It is then converted to the required
|
|
||||||
output format */
|
|
||||||
video_st.tmp_frame = NULL;
|
|
||||||
- if (c->pix_fmt != PIX_FMT_RGB24) {
|
|
||||||
- video_st.tmp_frame = ffmpegdrv_alloc_picture(PIX_FMT_RGB24, c->width, c->height);
|
|
||||||
+ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
|
|
||||||
+ video_st.tmp_frame = ffmpegdrv_alloc_picture(VICE_AV_PIX_FMT_RGB24, c->width, c->height);
|
|
||||||
if (!video_st.tmp_frame) {
|
|
||||||
log_debug("ffmpegdrv: could not allocate temporary picture");
|
|
||||||
return -1;
|
|
||||||
@@ -769,9 +769,9 @@
|
|
||||||
|
|
||||||
#ifdef HAVE_FFMPEG_SWSCALE
|
|
||||||
/* setup scaler */
|
|
||||||
- if (c->pix_fmt != PIX_FMT_RGB24) {
|
|
||||||
+ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
|
|
||||||
sws_ctx = VICE_P_SWS_GETCONTEXT
|
|
||||||
- (video_width, video_height, PIX_FMT_RGB24,
|
|
||||||
+ (video_width, video_height, VICE_AV_PIX_FMT_RGB24,
|
|
||||||
video_width, video_height, c->pix_fmt,
|
|
||||||
SWS_BICUBIC,
|
|
||||||
NULL, NULL, NULL);
|
|
||||||
@@ -948,7 +948,7 @@
|
|
||||||
|
|
||||||
c = video_st.st->codec;
|
|
||||||
|
|
||||||
- if (c->pix_fmt != PIX_FMT_RGB24) {
|
|
||||||
+ if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
|
|
||||||
ffmpegdrv_fill_rgb_image(screenshot, video_st.tmp_frame);
|
|
||||||
|
|
||||||
if (sws_ctx != NULL) {
|
|
@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>games@gentoo.org</email>
|
|
||||||
<name>Gentoo Games Project</name>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="ethernet">Enable ethernet emulation</flag>
|
|
||||||
<flag name="fullscreen">Enable the ability to run fullscreen</flag>
|
|
||||||
<flag name="sdlsound">Use <pkg>media-libs/libsdl</pkg> for sound support</flag>
|
|
||||||
<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg> in the GTK+ interface</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="sourceforge">vice-emu</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
@ -1,180 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
inherit autotools eutils toolchain-funcs flag-o-matic xdg-utils
|
|
||||||
|
|
||||||
DESCRIPTION="The Versatile Commodore 8-bit Emulator"
|
|
||||||
HOMEPAGE="http://vice-emu.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
|
||||||
IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
|
|
||||||
|
|
||||||
# upstream says gtk3 and sdl2 shouldn't be exposed yet.
|
|
||||||
#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
|
|
||||||
REQUIRED_USE="?? ( gtk sdl )"
|
|
||||||
|
|
||||||
GTK_COMMON="
|
|
||||||
x11-libs/pango
|
|
||||||
x11-libs/cairo"
|
|
||||||
# gtk3? (
|
|
||||||
# x11-libs/gtk+:3
|
|
||||||
# vte? ( x11-libs/vte:2.90 )
|
|
||||||
# ${GTK_COMMON}
|
|
||||||
# )
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
virtual/jpeg:0
|
|
||||||
virtual/opengl
|
|
||||||
media-libs/giflib
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
pulseaudio? ( media-sound/pulseaudio )
|
|
||||||
sdlsound? ( media-libs/libsdl[sound] )
|
|
||||||
ethernet? (
|
|
||||||
>=net-libs/libpcap-0.9.8
|
|
||||||
>=net-libs/libnet-1.1.2.1:1.1
|
|
||||||
)
|
|
||||||
ffmpeg? ( virtual/ffmpeg )
|
|
||||||
lame? ( media-sound/lame )
|
|
||||||
nls? ( virtual/libintl )
|
|
||||||
png? ( media-libs/libpng:0 )
|
|
||||||
zlib? ( sys-libs/zlib )
|
|
||||||
sdl? (
|
|
||||||
media-libs/libsdl[joystick,video]
|
|
||||||
)
|
|
||||||
!sdl? (
|
|
||||||
fullscreen? (
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXxf86vm )
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXext
|
|
||||||
sys-libs/readline:0
|
|
||||||
)
|
|
||||||
gtk? (
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
vte? ( x11-libs/vte:0 )
|
|
||||||
x11-libs/gtkglext
|
|
||||||
${GTK_COMMON}
|
|
||||||
)
|
|
||||||
!sdl? ( !gtk? (
|
|
||||||
x11-libs/libXmu
|
|
||||||
x11-libs/libXpm
|
|
||||||
x11-libs/libXt
|
|
||||||
x11-libs/libXv
|
|
||||||
Xaw3d? ( x11-libs/libXaw3d )
|
|
||||||
!Xaw3d? ( x11-libs/libXaw )
|
|
||||||
) )
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig
|
|
||||||
!sdl? (
|
|
||||||
fullscreen? ( x11-proto/xf86vidmodeproto )
|
|
||||||
!gtk? (
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
)
|
|
||||||
)
|
|
||||||
x11-apps/bdftopcf
|
|
||||||
x11-apps/mkfontdir
|
|
||||||
x11-proto/xproto
|
|
||||||
x11-proto/xextproto
|
|
||||||
media-libs/fontconfig
|
|
||||||
x11-proto/videoproto
|
|
||||||
nls? ( sys-devel/gettext )"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${P}-autotools.patch
|
|
||||||
"${FILESDIR}"/${P}-ffmpeg3.patch
|
|
||||||
)
|
|
||||||
#"${FILESDIR}"/vice_rath.txt
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# See https://bugs.gentoo.org/599576
|
|
||||||
xdg_environment_reset
|
|
||||||
|
|
||||||
default
|
|
||||||
sed -i \
|
|
||||||
-e 's/building//' \
|
|
||||||
doc/Makefile.am || die
|
|
||||||
sed -i \
|
|
||||||
-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
|
|
||||||
doc/Makefile.am \
|
|
||||||
doc/readmes/Makefile.am || die
|
|
||||||
sed -i \
|
|
||||||
-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
|
|
||||||
doc/html/Makefile.am || die
|
|
||||||
sed -i \
|
|
||||||
-e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
|
|
||||||
man/vice.1 \
|
|
||||||
$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
|
|
||||||
sed -i \
|
|
||||||
-e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
|
|
||||||
configure.ac || die
|
|
||||||
sed -i \
|
|
||||||
-e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
|
|
||||||
-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
|
|
||||||
src/arch/unix/archdep.h \
|
|
||||||
src/arch/sdl/archdep_unix.h || die
|
|
||||||
rm -rf src/lib/{libffmpeg,liblame} || die
|
|
||||||
sed -i \
|
|
||||||
-e '/SUBDIRS/s/libffmpeg//;' \
|
|
||||||
-e '/SUBDIRS/s/liblame//;' \
|
|
||||||
src/lib/Makefile.am || die
|
|
||||||
AT_NO_RECURSIVE=1 eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local gui_arg snd_arg
|
|
||||||
|
|
||||||
snd_arg+=" $(use_with alsa)"
|
|
||||||
snd_arg+=" $(use_with oss)"
|
|
||||||
snd_arg+=" $(use_with pulseaudio pulse)"
|
|
||||||
snd_arg+=" $(use_with sdlsound)"
|
|
||||||
|
|
||||||
gui_arg+=" $(use_enable sdl sdlui)"
|
|
||||||
# The gtk UI code has raw calls to XOpenDisplay and
|
|
||||||
# is missing -lX11 if vte doesn't pull it in.
|
|
||||||
#if use gtk2 || use gtk3 ; then
|
|
||||||
if use gtk ; then
|
|
||||||
use vte || append-libs -lX11
|
|
||||||
fi
|
|
||||||
gui_arg+=" $(use_enable gtk gnomeui)"
|
|
||||||
#gui_arg+=" $(use_enable gtk3 gnomeui3)"
|
|
||||||
gui_arg+=" $(use_enable Xaw3d xaw3d)"
|
|
||||||
|
|
||||||
# --with-readline is forced to avoid using the embedded copy
|
|
||||||
# don't try to actually run fc-cache (bug #280976)
|
|
||||||
FCCACHE=/bin/true \
|
|
||||||
PKG_CONFIG=$(tc-getPKG_CONFIG) \
|
|
||||||
econf \
|
|
||||||
--enable-parsid \
|
|
||||||
--with-resid \
|
|
||||||
--with-readline \
|
|
||||||
--without-arts \
|
|
||||||
--without-midas \
|
|
||||||
$(use_enable ethernet) \
|
|
||||||
$(use_enable ffmpeg) \
|
|
||||||
$(use_enable ffmpeg external-ffmpeg) \
|
|
||||||
$(use_enable fullscreen) \
|
|
||||||
$(use_enable ipv6) \
|
|
||||||
$(use_enable lame) \
|
|
||||||
$(use_enable nls) \
|
|
||||||
$(use_enable vte) \
|
|
||||||
$(use_with png) \
|
|
||||||
$(use_with threads uithreads) \
|
|
||||||
$(use_with zlib) \
|
|
||||||
${gui_arg} \
|
|
||||||
${snd_arg} \
|
|
||||||
--disable-option-checking
|
|
||||||
# --disable-option-checking has to be last
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
DOCS="FEEDBACK"
|
|
||||||
default
|
|
||||||
}
|
|
@ -1,172 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
inherit autotools eutils toolchain-funcs flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="The Versatile Commodore 8-bit Emulator"
|
|
||||||
HOMEPAGE="http://vice-emu.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="Xaw3d alsa ethernet ffmpeg fullscreen gtk +gtk3 ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
|
|
||||||
|
|
||||||
# upstream says gtk3 and sdl2 shouldn't be exposed yet.
|
|
||||||
REQUIRED_USE="?? ( gtk gtk3 sdl )"
|
|
||||||
#REQUIRED_USE="?? ( gtk sdl )"
|
|
||||||
|
|
||||||
GTK_COMMON="
|
|
||||||
x11-libs/pango
|
|
||||||
x11-libs/cairo
|
|
||||||
gtk3? (
|
|
||||||
x11-libs/gtk+:3
|
|
||||||
vte? ( x11-libs/vte:2.90 )
|
|
||||||
${GTK_COMMON}
|
|
||||||
)"
|
|
||||||
RDEPEND="
|
|
||||||
virtual/jpeg:0
|
|
||||||
virtual/opengl
|
|
||||||
media-libs/giflib
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
pulseaudio? ( media-sound/pulseaudio )
|
|
||||||
sdlsound? ( media-libs/libsdl[sound] )
|
|
||||||
ethernet? (
|
|
||||||
>=net-libs/libpcap-0.9.8
|
|
||||||
>=net-libs/libnet-1.1.2.1:1.1
|
|
||||||
)
|
|
||||||
ffmpeg? ( virtual/ffmpeg )
|
|
||||||
lame? ( media-sound/lame )
|
|
||||||
nls? ( virtual/libintl )
|
|
||||||
png? ( media-libs/libpng:0 )
|
|
||||||
zlib? ( sys-libs/zlib )
|
|
||||||
sdl? (
|
|
||||||
media-libs/libsdl[joystick,video]
|
|
||||||
)
|
|
||||||
!sdl? (
|
|
||||||
fullscreen? (
|
|
||||||
x11-libs/libXrandr
|
|
||||||
x11-libs/libXxf86vm )
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXext
|
|
||||||
sys-libs/readline:0
|
|
||||||
)
|
|
||||||
gtk? (
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
vte? ( x11-libs/vte:0 )
|
|
||||||
x11-libs/gtkglext
|
|
||||||
${GTK_COMMON}
|
|
||||||
)
|
|
||||||
!sdl? ( !gtk? (
|
|
||||||
x11-libs/libXmu
|
|
||||||
x11-libs/libXpm
|
|
||||||
x11-libs/libXt
|
|
||||||
x11-libs/libXv
|
|
||||||
Xaw3d? ( x11-libs/libXaw3d )
|
|
||||||
!Xaw3d? ( x11-libs/libXaw )
|
|
||||||
) )
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig
|
|
||||||
!sdl? (
|
|
||||||
fullscreen? ( x11-proto/xf86vidmodeproto )
|
|
||||||
!gtk? (
|
|
||||||
x11-libs/libICE
|
|
||||||
x11-libs/libSM
|
|
||||||
)
|
|
||||||
)
|
|
||||||
x11-apps/bdftopcf
|
|
||||||
x11-apps/mkfontdir
|
|
||||||
x11-proto/xproto
|
|
||||||
x11-proto/xextproto
|
|
||||||
media-libs/fontconfig
|
|
||||||
x11-proto/videoproto
|
|
||||||
nls? ( sys-devel/gettext )"
|
|
||||||
|
|
||||||
PATCH=(
|
|
||||||
"${FILESDIR}"/${P}-autotools.patch
|
|
||||||
)
|
|
||||||
#"${FILESDIR}"/vice_rath.txt
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
sed -i \
|
|
||||||
-e 's/building//' \
|
|
||||||
doc/Makefile.am || die
|
|
||||||
sed -i \
|
|
||||||
-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
|
|
||||||
doc/Makefile.am \
|
|
||||||
doc/readmes/Makefile.am || die
|
|
||||||
sed -i \
|
|
||||||
-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
|
|
||||||
doc/html/Makefile.am || die
|
|
||||||
sed -i \
|
|
||||||
-e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
|
|
||||||
man/vice.1 \
|
|
||||||
$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
|
|
||||||
sed -i \
|
|
||||||
-e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
|
|
||||||
configure.ac || die
|
|
||||||
sed -i \
|
|
||||||
-e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
|
|
||||||
-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
|
|
||||||
src/arch/unix/archdep.h \
|
|
||||||
src/arch/sdl/archdep_unix.h || die
|
|
||||||
rm -rf src/lib/{libffmpeg,liblame} || die
|
|
||||||
sed -i \
|
|
||||||
-e '/SUBDIRS/s/libffmpeg//;' \
|
|
||||||
-e '/SUBDIRS/s/liblame//;' \
|
|
||||||
src/lib/Makefile.am || die
|
|
||||||
AT_NO_RECURSIVE=1 eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local gui_arg snd_arg
|
|
||||||
|
|
||||||
snd_arg+=" $(use_with alsa)"
|
|
||||||
snd_arg+=" $(use_with oss)"
|
|
||||||
snd_arg+=" $(use_with pulseaudio pulse)"
|
|
||||||
snd_arg+=" $(use_with sdlsound)"
|
|
||||||
|
|
||||||
gui_arg+=" $(use_enable sdl sdlui)"
|
|
||||||
# The gtk UI code has raw calls to XOpenDisplay and
|
|
||||||
# is missing -lX11 if vte doesn't pull it in.
|
|
||||||
if use gtk || use gtk3 ; then
|
|
||||||
use vte || append-libs -lX11
|
|
||||||
fi
|
|
||||||
gui_arg+=" $(use_enable gtk gnomeui)"
|
|
||||||
gui_arg+=" $(use_enable gtk3 gnomeui3)"
|
|
||||||
gui_arg+=" $(use_enable Xaw3d xaw3d)"
|
|
||||||
|
|
||||||
# --with-readline is forced to avoid using the embedded copy
|
|
||||||
# don't try to actually run fc-cache (bug #280976)
|
|
||||||
FCCACHE=/bin/true \
|
|
||||||
PKG_CONFIG=$(tc-getPKG_CONFIG) \
|
|
||||||
econf \
|
|
||||||
--enable-parsid \
|
|
||||||
--with-resid \
|
|
||||||
--with-readline \
|
|
||||||
--without-arts \
|
|
||||||
--without-midas \
|
|
||||||
$(use_enable ethernet) \
|
|
||||||
$(use_enable ffmpeg) \
|
|
||||||
$(use_enable ffmpeg external-ffmpeg) \
|
|
||||||
$(use_enable fullscreen) \
|
|
||||||
$(use_enable ipv6) \
|
|
||||||
$(use_enable lame) \
|
|
||||||
$(use_enable nls) \
|
|
||||||
$(use_enable vte) \
|
|
||||||
$(use_with png) \
|
|
||||||
$(use_with threads uithreads) \
|
|
||||||
$(use_with zlib) \
|
|
||||||
${gui_arg} \
|
|
||||||
${snd_arg} \
|
|
||||||
--disable-option-checking
|
|
||||||
# --disable-option-checking has to be last
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
DOCS="FEEDBACK"
|
|
||||||
default
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
AUX create_vbox_modules_tarball.sh 896 SHA256 4309bbf762e05ae09a2b92a737abddb89807b5a36f587178d7ac7f6ad4d91316 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771 WHIRLPOOL 761079d4ba0124488be9cc78305eef6c6df18d232c539ff4479caf3f04ea307e043c92a5f4099c7745a4e23741ce28259e87dd79bce8cee6862ef5e0661b2497
|
|
||||||
AUX virtualbox-modules-4.1.4-pax-const.patch 2335 SHA256 d23da93fa1a3b7833766caa8329745ed7de7a5ed6ce1fecb090325fdc83e42f3 SHA512 8f5ffcd53f34e616b895013660e269e6031837411471abf69711df4fd5d745299dcb08d361eda0979dcfde7d9aafa0d24c99fcc9f3875fbf35771945f6b224a1 WHIRLPOOL b875d0747bdf3c2970d9dc84c7e4f6fac1bd37b85ba6086a981397c8b506a7af2709fa94317896650fd9ae98921d40f399e589b851eb2da2f9854eb1f443930c
|
|
||||||
AUX virtualbox-modules-5.1.10-ALIGN-backport.patch 384 SHA256 f5116b4974777336a723fce3c0614381d87ccfadb172b0ea606a87a0bad3310e SHA512 2557f8dbec2771ee1c9dd6d8c2e3d96b514da19e23d2d8e8b485191dbd5b5faa77fd28ab2d6d17b8da39017f19ca139eada2120d1da12c0b28f44f92812132b6 WHIRLPOOL 94ca5abe44d3130f367077c23d55b114b9b77d41d56db12c846cd97e5e426733310a2b96acd2a1d712c3b0fa73215e1f0133ad58b4de5297055698bc9f507661
|
|
||||||
AUX virtualbox-modules-5.1.28-udp.patch 1238 SHA256 69a5be1e6bf6b27d33af8dba2ef017a9da738b3e3e656577e5d39b324915c40e SHA512 79e6444b64db1da2aea727233de91ce6ff6075eb8bea1098ca8430445a50b50c036aa9e27317c568bdb6b7f22bb8fa177e97caaea1701c06a9709ee8a3133a51 WHIRLPOOL c1f143cc0beff05b3b5e6427503077203b0bd4a87eb8b0dc3369a6ee57a29d1d7ca208e7f40911332fabd4c67be2b0fa63bf74569dc9e38beff9919bc877e170
|
|
||||||
AUX virtualbox-modules-5.1.30-timer-setup.patch 1686 SHA256 9fddfaf9aa9a684332b1ab9cb05ab0d69a384300c8f8d7644510698058ed96bd SHA512 6f827fe6be4be6a5d1b96b0d745f78381b0dbbcbf6d448372a50103d1d3dc83e891af5d3996a89095b834cf86be659a6f3e863bbb12211774245a7905f6a56b7 WHIRLPOOL dcb3caab91c29646dc0a44604e2d29ff3505bc8ba888bbb403fdd66c65edcab897c6989521da4d45ab515ae0c52cd7b746061dd3b891a348ec8d7047e94a7984
|
|
||||||
AUX virtualbox-modules-linux-4.12_1_of_2.patch 2748 SHA256 5d8559d3ed17e5280affb69720af328045d8858e4f513da7c92f23f206ac349b SHA512 21a3a287dddc76219e8786b4951dfe810d515b9df5b75537ad0bf97f1899250124892d6a9ed167065af68af3f0df29f81e5000a73ccd2f7e3baebb375b100b76 WHIRLPOOL 5047474bb56c80a3d35e3323b3ca89886d6427403028e163595fcc1624f5d2fea4f3e8fdfc7ae5fc51ed2f82093e648e4fdb0952f0331aa6d55f62def970b3fc
|
|
||||||
AUX virtualbox-modules-linux-4.12_2_of_2.patch 3254 SHA256 9396f821927924c859d85b6ea0a7a69dd4abc51d101cb3df6abca34cfd7007c9 SHA512 ff31c0d7075f680838202d133604b9ddd8ae36bee3c0ac2c2580e5839ebd427eea6184ed260492fe6d32791e659938d57d44fdb7b8f211ce91a9472d15d35449 WHIRLPOOL ef5b71d84249b05e38593ed9a18bf3c031b25e59f03bfceb810d449cfabd4f828210153fe4413590d93e3c39e21da54ab0fb71303ef3914493623d26c47d7f62
|
|
||||||
AUX virtualbox.conf 38 SHA256 eb1ba5b5f8a2b795e3b050105a2f24cb5df9d392c6c4a3a9756e17f74ffeb146 SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a WHIRLPOOL cadd73f81d8ddb545fb31ec2328103f998e5754d6f7fe63de7e72987992d49cb84c309b52e852cc221c078a39f1ec542662fc68b200478a6cec8e12881aee8bb
|
|
||||||
DIST vbox-kernel-module-src-5.1.30.tar.xz 625424 SHA256 879b1bc45b9f1a3fd929d2fd2e67dcaffe4074839f6364bf0e64618bfe2b3b2e SHA512 8e2113584e63e2ace71b708dc77428fd09167a1bded12b47312a5a8f85ef448e17f76b4300dba4c8ec99d7f8cb278cef039c6282c676e35b8f200bafb5c4770a WHIRLPOOL aa6fc3a0516514c2ca0c39ea28200559582fdd648e96084a5ca1daabfd1f478312199576ad27336eba124b443fbe122364efde2c60ca3386872cd1274333f4df
|
|
||||||
EBUILD virtualbox-modules-5.1.30.ebuild 1821 SHA256 c757fceef11df23acc1b1be36c0bcbd317f25dce3c69d9d614da8b68e2d1ebb3 SHA512 5c033c92a411cfd2324c7b1da9a3d9ff13914b4140e0adea047109b4461a2986c1bd6989931e02c38e314de71e52ed3075753626a7ab766724c37f2cad845c8c WHIRLPOOL 521d87b405bba898458e3ef5e30ad32d8ce94629416aed409f698c65781315d60741363002cd80078484c8f4cf0f9473880dcd36b3f2b9481c6c20646915d297
|
|
||||||
MISC metadata.xml 502 SHA256 0d9c3daad11ea6f866d7600d188621b46992e253faaff2041c2d05206daac239 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4 WHIRLPOOL 080399fd9fb91197af76e134ef7081c8f6fe04ddf00b09c206bd8b3f45a3e558235ce63e25917602e2bba95a974e5f6818f1e7b9e596a4e37cc961c271671b3d
|
|
@ -1,29 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Create a virtualbox modules tarball from a VirtualBox binary package.
|
|
||||||
# We cannot download the package by this script because of the unpredictable
|
|
||||||
# build number being in the filename.
|
|
||||||
#
|
|
||||||
# usage: create_vbox_modules_tarball.sh VirtualBox-4.1.18-78361-Linux_amd64.run
|
|
||||||
|
|
||||||
[ -f "$1" ] || exit 1
|
|
||||||
|
|
||||||
VBOX_PACKAGE="$1"
|
|
||||||
VERSION_SUFFIX=""
|
|
||||||
|
|
||||||
if [[ ${VBOX_PACKAGE} = *_BETA* ]] || [[ ${VBOX_PACKAGE} = *_RC* ]] ; then
|
|
||||||
VERSION_SUFFIX="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-[[:digit:]\.]\+\(_[[:alpha:]]\+[[:digit:]]\).*@\L\1@')"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
VBOX_VER="$(echo ${VBOX_PACKAGE} | sed 's@.*VirtualBox-\([[:digit:]\.]\+\).*@\1@')${VERSION_SUFFIX}"
|
|
||||||
|
|
||||||
|
|
||||||
sh ${VBOX_PACKAGE} --noexec --keep --nox11 || exit 2
|
|
||||||
cd install || exit 3
|
|
||||||
tar -xaf VirtualBox.tar.bz2 || exit 4
|
|
||||||
cd src/vboxhost || exit 5
|
|
||||||
tar -cvJf ../../../vbox-kernel-module-src-${VBOX_VER}.tar.xz . || exit 6
|
|
||||||
cd ../../.. && rm install -rf
|
|
||||||
|
|
||||||
exit 0
|
|
@ -1,48 +0,0 @@
|
|||||||
diff -urp vboxdrv.orig/SUPDrvIDC.h vboxdrv/SUPDrvIDC.h
|
|
||||||
--- vboxdrv.orig/SUPDrvIDC.h 2011-09-06 15:53:27.852567531 +0200
|
|
||||||
+++ vboxdrv/SUPDrvIDC.h 2011-09-06 15:54:05.420565524 +0200
|
|
||||||
@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM
|
|
||||||
{
|
|
||||||
/** The symbol address. */
|
|
||||||
PFNRT pfnSymbol;
|
|
||||||
- } Out;
|
|
||||||
+ } __no_const Out;
|
|
||||||
} u;
|
|
||||||
} SUPDRVIDCREQGETSYM;
|
|
||||||
/** Pointer to a SUPDRV IDC get symbol request. */
|
|
||||||
diff -urp vboxnetflt.orig/include/VBox/intnet.h vboxnetflt/include/VBox/intnet.h
|
|
||||||
--- vboxnetflt.orig/include/VBox/intnet.h 2011-09-06 15:53:27.852567531 +0200
|
|
||||||
+++ vboxnetflt/include/VBox/intnet.h 2011-09-06 15:54:05.424565524 +0200
|
|
||||||
@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY
|
|
||||||
DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY *pIfFactory, const char *pszName,
|
|
||||||
PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags,
|
|
||||||
PINTNETTRUNKIFPORT *ppIfPort));
|
|
||||||
-} INTNETTRUNKFACTORY;
|
|
||||||
+} __no_const INTNETTRUNKFACTORY;
|
|
||||||
/** Pointer to the trunk factory. */
|
|
||||||
typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY;
|
|
||||||
|
|
||||||
diff -urp vboxnetflt.orig/linux/VBoxNetFlt-linux.c vboxnetflt/linux/VBoxNetFlt-linux.c
|
|
||||||
--- vboxnetflt.orig/linux/VBoxNetFlt-linux.c 2011-07-19 12:15:22.000000000 +0200
|
|
||||||
+++ vboxnetflt/linux/VBoxNetFlt-linux.c 2011-09-06 15:56:00.516559379 +0200
|
|
||||||
@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE;
|
|
||||||
|
|
||||||
# else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */
|
|
||||||
|
|
||||||
-typedef struct net_device_ops OVR_OPSTYPE;
|
|
||||||
+typedef net_device_ops_no_const OVR_OPSTYPE;
|
|
||||||
# define OVR_OPS netdev_ops
|
|
||||||
# define OVR_XMIT pOrgOps->ndo_start_xmit
|
|
||||||
|
|
||||||
diff -urp vboxpci.orig/include/VBox/rawpci.h vboxpci/include/VBox/rawpci.h
|
|
||||||
--- vboxpci.orig/include/VBox/rawpci.h 2011-04-18 17:01:12.000000000 +0200
|
|
||||||
+++ vboxpci/include/VBox/rawpci.h 2011-09-06 15:57:17.340555277 +0200
|
|
||||||
@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY
|
|
||||||
DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory,
|
|
||||||
PVM pVM,
|
|
||||||
PRAWPCIPERVM pPciData));
|
|
||||||
-} RAWPCIFACTORY;
|
|
||||||
+} __no_const RAWPCIFACTORY;
|
|
||||||
|
|
||||||
#define RAWPCIFACTORY_UUID_STR "ea089839-4171-476f-adfb-9e7ab1cbd0fb"
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
Index: trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h
|
|
||||||
===================================================================
|
|
||||||
--- a/vboxdrv/SUPDrvInternal.h
|
|
||||||
+++ b/vboxdrv/SUPDrvInternal.h
|
|
||||||
@@ -65,7 +65,4 @@
|
|
||||||
# include <linux/modversions.h>
|
|
||||||
# endif
|
|
||||||
-# endif
|
|
||||||
-# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
|
|
||||||
-# undef ALIGN
|
|
||||||
# endif
|
|
||||||
# ifndef KBUILD_STR
|
|
@ -1,35 +0,0 @@
|
|||||||
diff --git a/work/vboxnetflt/linux/VBoxNetFlt-linux.c b/work/vboxnetflt/linux/VBoxNetFlt-linux.c
|
|
||||||
index f824654..b61d82c 100644
|
|
||||||
--- work/vboxnetflt/linux/VBoxNetFlt-linux.c
|
|
||||||
+++ work/vboxnetflt/linux/VBoxNetFlt-linux.c
|
|
||||||
@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
|
||||||
+#define SKB_GSO_UDP 0
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
|
||||||
# define VBOX_HAVE_SKB_VLAN
|
|
||||||
#else
|
|
||||||
diff --git a/work/vboxpci/linux/VBoxPci-linux.c b/work/vboxpci/linux/VBoxPci-linux.c
|
|
||||||
index 2dbf47f..e361ef3 100644
|
|
||||||
--- work/vboxpci/linux/VBoxPci-linux.c
|
|
||||||
+++ work/vboxpci/linux/VBoxPci-linux.c
|
|
||||||
@@ -353,12 +353,16 @@ static void vboxPciFileClose(struct file* file)
|
|
||||||
static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
|
||||||
+ ret = kernel_write(file, data, size, &offset);
|
|
||||||
+#else
|
|
||||||
mm_segment_t fs_save;
|
|
||||||
|
|
||||||
fs_save = get_fs();
|
|
||||||
set_fs(get_ds());
|
|
||||||
ret = vfs_write(file, data, size, &offset);
|
|
||||||
set_fs(fs_save);
|
|
||||||
+#endif
|
|
||||||
if (ret < 0)
|
|
||||||
printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
|
|
@ -1,35 +0,0 @@
|
|||||||
diff --git a/work/vboxdrv/r0drv/linux/timer-r0drv-linux.c b/work/vboxdrv/r0drv/linux/timer-r0drv-linux.c
|
|
||||||
index 2bb2bfb..3b4a508 100644
|
|
||||||
--- work/vboxdrv/r0drv/linux/timer-r0drv-linux.c
|
|
||||||
+++ work/vboxdrv/r0drv/linux/timer-r0drv-linux.c
|
|
||||||
@@ -720,9 +720,9 @@ static enum hrtimer_restart rtTimerLinuxHrCallback(struct hrtimer *pHrTimer)
|
|
||||||
*
|
|
||||||
* @param ulUser Address of the sub-timer structure.
|
|
||||||
*/
|
|
||||||
-static void rtTimerLinuxStdCallback(unsigned long ulUser)
|
|
||||||
+static void rtTimerLinuxStdCallback(struct timer_list *t)
|
|
||||||
{
|
|
||||||
- PRTTIMERLNXSUBTIMER pSubTimer = (PRTTIMERLNXSUBTIMER)ulUser;
|
|
||||||
+ PRTTIMERLNXSUBTIMER pSubTimer = from_timer(pSubTimer,t,u.Std.LnxTimer);
|
|
||||||
PRTTIMER pTimer = pSubTimer->pParent;
|
|
||||||
|
|
||||||
RTTIMERLNX_LOG(("stdcallback %p\n", pTimer));
|
|
||||||
@@ -1584,6 +1584,10 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_t u64NanoInterval, uint32_
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
+
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
|
||||||
+ timer_setup(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer,rtTimerLinuxStdCallback,TIMER_PINNED);
|
|
||||||
+#else
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
|
|
||||||
init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);
|
|
||||||
#else
|
|
||||||
@@ -1591,6 +1595,7 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_t u64NanoInterval, uint32_
|
|
||||||
#endif
|
|
||||||
pTimer->aSubTimers[iCpu].u.Std.LnxTimer.data = (unsigned long)&pTimer->aSubTimers[iCpu];
|
|
||||||
pTimer->aSubTimers[iCpu].u.Std.LnxTimer.function = rtTimerLinuxStdCallback;
|
|
||||||
+#endif
|
|
||||||
pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies;
|
|
||||||
pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0;
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
diff -ru3 vbox-kernel-module-src-5.1.22.old/vboxdrv/include/iprt/string.h vbox-kernel-module-src-5.1.22/vboxdrv/include/iprt/string.h
|
|
||||||
--- vbox-kernel-module-src-5.1.22.old/vboxdrv/include/iprt/string.h 2017-04-05 16:52:55.000000000 +0300
|
|
||||||
+++ vbox-kernel-module-src-5.1.22/vboxdrv/include/iprt/string.h 2017-07-05 01:25:52.712343705 +0300
|
|
||||||
@@ -32,11 +32,7 @@
|
|
||||||
#include <iprt/stdarg.h>
|
|
||||||
#include <iprt/err.h> /* for VINF_SUCCESS */
|
|
||||||
#if defined(RT_OS_LINUX) && defined(__KERNEL__)
|
|
||||||
- RT_C_DECLS_BEGIN
|
|
||||||
-# define new newhack /* string.h: strreplace */
|
|
||||||
# include <linux/string.h>
|
|
||||||
-# undef new
|
|
||||||
- RT_C_DECLS_END
|
|
||||||
|
|
||||||
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
|
|
||||||
RT_C_DECLS_BEGIN
|
|
||||||
diff -ru3 vbox-kernel-module-src-5.1.22.old/vboxnetadp/include/iprt/string.h vbox-kernel-module-src-5.1.22/vboxnetadp/include/iprt/string.h
|
|
||||||
--- vbox-kernel-module-src-5.1.22.old/vboxnetadp/include/iprt/string.h 2017-04-05 16:52:55.000000000 +0300
|
|
||||||
+++ vbox-kernel-module-src-5.1.22/vboxnetadp/include/iprt/string.h 2017-07-05 01:25:52.712343705 +0300
|
|
||||||
@@ -32,11 +32,7 @@
|
|
||||||
#include <iprt/stdarg.h>
|
|
||||||
#include <iprt/err.h> /* for VINF_SUCCESS */
|
|
||||||
#if defined(RT_OS_LINUX) && defined(__KERNEL__)
|
|
||||||
- RT_C_DECLS_BEGIN
|
|
||||||
-# define new newhack /* string.h: strreplace */
|
|
||||||
# include <linux/string.h>
|
|
||||||
-# undef new
|
|
||||||
- RT_C_DECLS_END
|
|
||||||
|
|
||||||
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
|
|
||||||
RT_C_DECLS_BEGIN
|
|
||||||
diff -ru3 vbox-kernel-module-src-5.1.22.old/vboxnetflt/include/iprt/string.h vbox-kernel-module-src-5.1.22/vboxnetflt/include/iprt/string.h
|
|
||||||
--- vbox-kernel-module-src-5.1.22.old/vboxnetflt/include/iprt/string.h 2017-04-05 16:52:55.000000000 +0300
|
|
||||||
+++ vbox-kernel-module-src-5.1.22/vboxnetflt/include/iprt/string.h 2017-07-05 01:25:52.712343705 +0300
|
|
||||||
@@ -32,11 +32,7 @@
|
|
||||||
#include <iprt/stdarg.h>
|
|
||||||
#include <iprt/err.h> /* for VINF_SUCCESS */
|
|
||||||
#if defined(RT_OS_LINUX) && defined(__KERNEL__)
|
|
||||||
- RT_C_DECLS_BEGIN
|
|
||||||
-# define new newhack /* string.h: strreplace */
|
|
||||||
# include <linux/string.h>
|
|
||||||
-# undef new
|
|
||||||
- RT_C_DECLS_END
|
|
||||||
|
|
||||||
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
|
|
||||||
RT_C_DECLS_BEGIN
|
|
||||||
diff -ru3 vbox-kernel-module-src-5.1.22.old/vboxpci/include/iprt/string.h vbox-kernel-module-src-5.1.22/vboxpci/include/iprt/string.h
|
|
||||||
--- vbox-kernel-module-src-5.1.22.old/vboxpci/include/iprt/string.h 2017-04-05 16:52:55.000000000 +0300
|
|
||||||
+++ vbox-kernel-module-src-5.1.22/vboxpci/include/iprt/string.h 2017-07-05 01:25:52.712343705 +0300
|
|
||||||
@@ -32,11 +32,7 @@
|
|
||||||
#include <iprt/stdarg.h>
|
|
||||||
#include <iprt/err.h> /* for VINF_SUCCESS */
|
|
||||||
#if defined(RT_OS_LINUX) && defined(__KERNEL__)
|
|
||||||
- RT_C_DECLS_BEGIN
|
|
||||||
-# define new newhack /* string.h: strreplace */
|
|
||||||
# include <linux/string.h>
|
|
||||||
-# undef new
|
|
||||||
- RT_C_DECLS_END
|
|
||||||
|
|
||||||
#elif defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
|
|
||||||
RT_C_DECLS_BEGIN
|
|
@ -1,93 +0,0 @@
|
|||||||
diff -ruN vboxhost.orig/vboxdrv/linux/SUPDrv-linux.c vboxhost/vboxdrv/linux/SUPDrv-linux.c
|
|
||||||
--- vboxhost.orig/vboxdrv/linux/SUPDrv-linux.c 2016-08-22 00:00:00.000000000 +0200
|
|
||||||
+++ vboxhost/vboxdrv/linux/SUPDrv-linux.c 2017-05-31 19:00:22.887324690 +0200
|
|
||||||
@@ -1397,7 +1397,7 @@
|
|
||||||
SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
|
|
||||||
{
|
|
||||||
uint32_t fFlags = 0;
|
|
||||||
-#ifdef CONFIG_PAX_KERNEXEC
|
|
||||||
+#if defined(CONFIG_PAX_KERNEXEC) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
fFlags |= SUPKERNELFEATURES_GDT_READ_ONLY;
|
|
||||||
#endif
|
|
||||||
#if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
|
|
||||||
diff -ruN vboxhost.orig/vboxdrv/r0drv/linux/alloc-r0drv-linux.c vboxhost/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
|
|
||||||
--- vboxhost.orig/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2016-08-22 00:00:00.000000000 +0200
|
|
||||||
+++ vboxhost/vboxdrv/r0drv/linux/alloc-r0drv-linux.c 2017-05-31 19:03:32.465413475 +0200
|
|
||||||
@@ -35,7 +35,10 @@
|
|
||||||
#include <iprt/assert.h>
|
|
||||||
#include <iprt/err.h>
|
|
||||||
#include "r0drv/alloc-r0drv.h"
|
|
||||||
-
|
|
||||||
+#include <linux/kmemleak.h>
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+#include <asm/set_memory.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
|
|
||||||
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
|
|
||||||
diff -ruN vboxhost.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
|
|
||||||
--- vboxhost.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2017-02-02 16:54:00.000000000 +0100
|
|
||||||
+++ vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2017-05-31 19:23:05.187059423 +0200
|
|
||||||
@@ -899,6 +899,9 @@
|
|
||||||
unsigned long pfn;
|
|
||||||
struct page *pPage;
|
|
||||||
pte_t *pEntry;
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+ p4d_t p4d;
|
|
||||||
+#endif
|
|
||||||
union
|
|
||||||
{
|
|
||||||
pgd_t Global;
|
|
||||||
@@ -917,9 +920,18 @@
|
|
||||||
u.Global = *pgd_offset(current->active_mm, ulAddr);
|
|
||||||
if (RT_UNLIKELY(pgd_none(u.Global)))
|
|
||||||
return NULL;
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+ p4d = *p4d_offset(&u.Global, ulAddr);
|
|
||||||
+ if (RT_UNLIKELY(p4d_none(p4d) || p4d_large(p4d) || !p4d_present(p4d)))
|
|
||||||
+ return NULL;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+ u.Upper = *pud_offset(&p4d, ulAddr);
|
|
||||||
+#else
|
|
||||||
u.Upper = *pud_offset(&u.Global, ulAddr);
|
|
||||||
+#endif
|
|
||||||
if (RT_UNLIKELY(pud_none(u.Upper)))
|
|
||||||
return NULL;
|
|
||||||
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
|
|
||||||
@@ -1463,13 +1475,23 @@
|
|
||||||
{
|
|
||||||
int rc = -ENOMEM;
|
|
||||||
pgd_t *pgd;
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+ p4d_t *p4d;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
spin_lock(&mm->page_table_lock);
|
|
||||||
|
|
||||||
pgd = pgd_offset(mm, ulAddr);
|
|
||||||
if (!pgd_none(*pgd) && !pgd_bad(*pgd))
|
|
||||||
{
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+ p4d = p4d_offset(*pgd, ulAddr);
|
|
||||||
+ if (p4d_none(*p4d))
|
|
||||||
+ goto exit;
|
|
||||||
+ pmd_t *pmd = pmd_offset(p4d, ulAddr);
|
|
||||||
+#else
|
|
||||||
pmd_t *pmd = pmd_offset(pgd, ulAddr);
|
|
||||||
+#endif
|
|
||||||
if (!pmd_none(*pmd))
|
|
||||||
{
|
|
||||||
pte_t *ptep = pte_offset_map(pmd, ulAddr);
|
|
||||||
@@ -1487,6 +1509,9 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
|
||||||
+exit:
|
|
||||||
+#endif
|
|
||||||
spin_unlock(&mm->page_table_lock);
|
|
||||||
return rc;
|
|
||||||
}
|
|
@ -1,4 +0,0 @@
|
|||||||
vboxnetflt
|
|
||||||
vboxnetadp
|
|
||||||
vboxdrv
|
|
||||||
vboxpci
|
|
@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>polynomial-c@gentoo.org</email>
|
|
||||||
<name>Lars Wendler</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>masterzorag@gmail.com</email>
|
|
||||||
<description>Proxy maintainer. CC him on bugs</description>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
|
|
||||||
</use>
|
|
||||||
</pkgmetadata>
|
|
@ -1,69 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
# XXX: the tarball here is just the kernel modules split out of the binary
|
|
||||||
# package that comes from virtualbox-bin
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit eutils linux-mod user
|
|
||||||
|
|
||||||
MY_P=vbox-kernel-module-src-${PV}
|
|
||||||
DESCRIPTION="Kernel Modules for Virtualbox"
|
|
||||||
HOMEPAGE="http://www.virtualbox.org/"
|
|
||||||
SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="pax_kernel"
|
|
||||||
|
|
||||||
RDEPEND="!=app-emulation/virtualbox-9999"
|
|
||||||
|
|
||||||
S=${WORKDIR}
|
|
||||||
|
|
||||||
BUILD_TARGETS="all"
|
|
||||||
BUILD_TARGET_ARCH="${ARCH}"
|
|
||||||
MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
enewgroup vboxusers
|
|
||||||
|
|
||||||
CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
|
|
||||||
ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
|
|
||||||
|
|
||||||
linux-mod_pkg_setup
|
|
||||||
|
|
||||||
BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
if kernel_is -ge 2 6 33 ; then
|
|
||||||
# evil patch for new kernels - header moved
|
|
||||||
grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use pax_kernel && kernel_is -ge 3 0 0 ; then
|
|
||||||
epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
if kernel_is -ge 4 14 0 ; then
|
|
||||||
epatch "${FILESDIR}"/virtualbox-modules-5.1.28-udp.patch
|
|
||||||
epatch "${FILESDIR}"/virtualbox-modules-5.1.30-timer-setup.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
default
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
linux-mod_src_install
|
|
||||||
insinto /usr/lib/modules-load.d/
|
|
||||||
doins "${FILESDIR}"/virtualbox.conf
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
linux-mod_pkg_postinst
|
|
||||||
elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
|
|
||||||
elog "\"vboxnetadp\" and \"vboxpci\" to:"
|
|
||||||
elog " /etc/conf.d/modules"
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user