diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /media-libs/svgalib | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'media-libs/svgalib')
7 files changed, 206 insertions, 38 deletions
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index a62b42b76221..c3f7eed3dda3 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -4,12 +4,15 @@ AUX svgalib-1.9.25-fix_buffer.patch 302 BLAKE2B a3e49949702305d6ee973134a50c7105 AUX svgalib-1.9.25-glibc210.patch 3842 BLAKE2B 99cfb6151d38fa75adaaa9fb0ff490430e71b416e9a5fb9b6fe228de4b937a8c36a5c645fa3a413c1cdfe3d4764720a961a7a97d9e00ff549283698dbda9bee1 SHA512 43813c240eaff58d993c0ed839bee0d5d73515e4954e7793536a981d149c882808ea79187b0bfe8511afcde78fd31b6e9ad94aaf20d28c8e96577d5f0e530d96 AUX svgalib-1.9.25-linux_2.6.28.patch 1672 BLAKE2B f5a18701cb29307a3d09656115bcca74ca3191eedf5f7c5c0e0d42ed38c548b2c51c06dfc9d0bd7cfc70832fc31c5b9738b5c989d2966f825927fb4adbac436b SHA512 ba3fcfb870768bc5d7e2d7acfe0381d6602b2e42d40e1d8b37246a60343e6e2f0b251c2a5fb32467773b565f4a0f38fdd5cba7c51fdf7fd36b0e5b988fcf2416 AUX svgalib-1.9.25-linux_2.6.36-r1.patch 1244 BLAKE2B ce52fd031092c6ed038e854723704a5aa3b380c296f88a27e99a906ac4072f37d86189e5021362a1aae9dc296161ff9f3b66a65f71b597e527fd3df8ad05fd33 SHA512 0a14679ee0029931e54387ff413aee43a01b107c277ff1fde52b1fb862d5ca56571028a527118b6f6c05a9485c00890b0eab35df4537e394bb4cc81e771e9ae0 -AUX svgalib-1.9.25-linux_2.6.patch 9547 BLAKE2B a13d0f848ed2a6dba750d9aaa90b571e32b59cb671ecddd0de0e9b71a9af29f2119ef1db85e8b9474e837e07bcc2981af4246c3c37ef01d991fea60f53093a48 SHA512 b2a1105735398f7f1f452612947a66c85bc0eca5c1e7f0d56f154d980dbfcf23bea2d5038145e6e004afb7658d7d3ab2de655a408da7c6853d8fdc817f775191 -AUX svgalib-1.9.25-linux_3.4.patch 1125 BLAKE2B 0dccae48a8a0ed12d7a7c08074cfba7d8fc6fa574868beef107cf59165086246342a620073579daa5b32f65a7cd1cc1c55a24e1db57d116965bf0561790c4a93 SHA512 35e035cfbe65823d8e5836653a058eb78bf3483c62a05dcad5a2aac3ac1ad47f63a7994c140d5b526bdf2e6edcfc5916452009cec056f73db664c0ffd3ba5857 -AUX svgalib-1.9.25-linux_3.9.patch 1045 BLAKE2B 6c5446a165234ef9c2dce2d407e39610849837c3eb88ccdf564d23bc2820ec5fe8480ef91c27d47235c17a660ac05836849540481621c99b1bbe952f147f31df SHA512 ce3529558b249351f0dbe915fcf940e9b478e60fc444d0727996eaa269f567d6a44707285b7c9a836c5a2309c217361620b6e655ec4331c6b25bd87e445cedeb +AUX svgalib-1.9.25-linux_2.6.patch 9645 BLAKE2B b21e62155b7e7b8084e606172524ae0b9db8543667aa2dce406f5475b2564bcdba0bd5f9a435f1dd5154be18b3ec89b1da9bfa8bc3adafaba26bd77902d8c227 SHA512 8d9076cf8d871815268b1efe71931b4aa1c857df37ed2ea4c407d0b15147e2aec7f0e1e234a4b39ad8de4c3ebdeb08f414f38682cd512857efaef30ddef55077 +AUX svgalib-1.9.25-linux_3.4.patch 1119 BLAKE2B c5d4102e392512094f9a64ac981e61718a44e78eebc93cbaf2aba4795b02fed38d003fd7b5d752b70ac10a187d63cbec199c73de6f5e6b91a6336e7637628c71 SHA512 2621e0036b2aae17eeb907588eb138b09f6d9b5e53cbd1cf329c656c22194114e78c83ff4fb8f82e6c44d02d1394dae501b5581fc44b7ed43929c7a7bb79f6e9 +AUX svgalib-1.9.25-linux_3.9.patch 1165 BLAKE2B 303aa7e9c45336b2971a95f2cd93ed33228e1bff71828924cbacc63a0d4e121f60640dbd33965268cd6c78cab8891b13b07bb309ab31fad65d5a37c713e7152e SHA512 779f3f10b84ef7217165e18367627cdf12536e841d2a2bf48d770c3f0ffc586b9c967d3f2839716e34400415fa6bd46fead9a3d42525439c84e26756b03716a4 AUX svgalib-1.9.25-missing_include.patch 1157 BLAKE2B eded4f9ac19d1254cbeb82e89fd1e5bf8647c4268ce5e26a57ce3d4c75bca649c7b9a60f70c6fd1ea29fc7b2fdb63019375b5d6739c1e409ff1de0d7f2bd5a84 SHA512 e0bc82f1c27f7d6003be8ce4e96005605dad73ff22086ceb0861d60931776ecaf86f4bca15b0f4a6e5f5ab5b5ec50d8fa305f53bb090f122ea38d88569834b8b +AUX svgalib-1.9.25-no-man-compression.patch 1018 BLAKE2B c05151ef1d119b9e78ac58e82a1327611dde1ff68e493ab16d282c427cf2d825e4671281b2be015d1e1da4ec90bc27de903e152de664574888a082d2f3c0a80c SHA512 b2444f4dea12f251011f026e5b3444909b0f7f5d09be48de2814e038d57850214173a9755f6818f9c13e06b27ef758526f09e35c58311298535ef1d6d77c0d3c AUX svgalib-1.9.25-vga_reset.patch 747 BLAKE2B 73e459c902be26584bc727bdb4c48398ed4200eaec7155ea12bee897906fd7c97dbb95961db6bc3d13dadbb620a9dd3220a201740343830fbef62db20713c78a SHA512 9baf930a3da15340f3f6823bcb45242bdf6b53d60d4ea2e9ef81af42e748838d40b2d5973821005decd3d44375508838fe852c89d1b704e57b790c042907ba94 +AUX svgalib-1.9.25-wrapdemo-buf-overflow.patch 516 BLAKE2B 504bdd01a0bde6858648f5e640fda34f337e6cef3f08f46b77fa453741fd556964fc09b48f494cf30b644fc1ff416c9728750d1c58502811d292d9b96ad415cc SHA512 e4e58a065f721f3c71d13f9ba0ffecf35ff32b25c6e46217eb9a0184b012e5be13c96c597df153ad7a27a5e41cc5a845cecae04d2d6c3dc6771bc238f8c75232 AUX svgalib.udev.rules.d.2 44 BLAKE2B 513532c74e5172a5f2882df1912508f12adf1347c3af1bf0a44f66781d139a28b7aa332f5a5e630d099b381b9a94931ba0b7ad787393228bf694878f442279ab SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82 DIST svgalib-1.9.25.tar.gz 987084 BLAKE2B 0ca81483d754796d8c96abef2940c506dd8c6f69ac015f0b34995a81db91c0540f405271f3c9e337ead551c783e9d6a336ef53bfb1531481115bd1228b679ea8 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7 EBUILD svgalib-1.9.25-r5.ebuild 3564 BLAKE2B 34169bab844e25a70e0872a767dc50b44efe2af788b8a2f6aa4c707d01e3e2c015c7fb25db1aaa45ee0617930251b83bf15618438fba26dd7e8195310b8c8368 SHA512 c32cd1636355ef7cba7572e894ab7d83c35becaaa999db1849535b8b179a800a34be5afda2a416ef54cb09fa37045d53c290dc909ecb6d04372d72b17b93f21d +EBUILD svgalib-1.9.25-r6.ebuild 3419 BLAKE2B 1f7f87fc20a728f90540974cc5691ea5d123f86359fa1918e55debf393fb593d831eb2c1a6fecb42a848c2d2ddd1902bc587349c32243a3c8ce0d54b0f5f2fd5 SHA512 67d8565d4d99dc67da5ec0ca3a5188f098045ebf4b82080ea644f88c9d58c58418bcae365d8f877a116c266dd6fd3d0ea094c4b96c8e46627dca8768dae8fd23 MISC metadata.xml 325 BLAKE2B eee2dcb0d80f8fa891865f3074139f3a9db2af0339f342f0f82512dc1195e7a95616a36ae9917e8724d12f15c1b5c056c3c5d242c32e989c354b39a7d6fbd5da SHA512 7d2874207eaab21b41da8bd8b9afb5cda10351e3c88fe09ae1856664115b3c86d13362a82695a016911390e5ff6762a86409b437a3d76b077e01ac0ff6662d5d diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch index 20ab1fe1ed16..113a2391cdfd 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch @@ -22,7 +22,7 @@ +++ svgalib/kernel/svgalib_helper/Makefile.alt @@ -37,7 +37,7 @@ CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR) - + ifeq (1,$(findstring 1,$(MODVER))) - CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h + CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1 diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch index 5e2d1e527cbb..ce9c74ccd205 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch @@ -1,29 +1,29 @@ -diff -Naur svgalib-1.9.25/kernel/svgalib_helper/main.c svgalib-1.9.25_new/kernel/svgalib_helper/main.c
---- svgalib-1.9.25/kernel/svgalib_helper/main.c 2006-01-12 18:17:53.000000000 +0000
-+++ svgalib-1.9.25_new/kernel/svgalib_helper/main.c 2012-06-25 15:02:11.000000000 +0100
-@@ -33,7 +33,9 @@
-
- #include <asm/processor.h>
- #include <asm/uaccess.h>
--#include <asm/system.h> /* cli(), *_flags */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
-+ #include <asm/system.h> /* cli(), *_flags */
-+#endif
- #include <asm/segment.h> /* memcpy and such */
- #include <asm/io.h>
- #include <asm/pgtable.h>
-diff -Naur svgalib-1.9.25/kernel/svgalib_helper/Makefile svgalib-1.9.25_new/kernel/svgalib_helper/Makefile
---- svgalib-1.9.25/kernel/svgalib_helper/Makefile 2006-05-20 13:31:04.000000000 +0100
-+++ svgalib-1.9.25_new/kernel/svgalib_helper/Makefile 2012-06-25 13:39:38.000000000 +0100
-@@ -11,9 +11,11 @@
- PWD := $(shell pwd)
- TARGET := svgalib_helper
-
-+ ifneq ($(TOPDIR),)
- ifeq ($(PATCHLEVEL),4)
- include $(TOPDIR)/Rules.make
- endif
-+ endif
-
- else
-
\ No newline at end of file +diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/Makefile svgalib-1.9.25/kernel/svgalib_helper/Makefile +--- svgalib-1.9.25.prev/kernel/svgalib_helper/Makefile 2020-05-02 09:49:05.072052128 +0300 ++++ svgalib-1.9.25/kernel/svgalib_helper/Makefile 2020-05-02 09:50:14.748043187 +0300 +@@ -11,9 +11,11 @@ + PWD := $(shell pwd) + TARGET := svgalib_helper + ++ ifneq ($(TOPDIR),) + ifeq ($(PATCHLEVEL),4) + include $(TOPDIR)/Rules.make + endif ++ endif + + else + +diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c svgalib-1.9.25/kernel/svgalib_helper/main.c +--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c 2020-05-02 09:49:05.075052085 +0300 ++++ svgalib-1.9.25/kernel/svgalib_helper/main.c 2020-05-02 09:50:14.751043144 +0300 +@@ -38,7 +38,9 @@ + + #include <asm/processor.h> + #include <asm/uaccess.h> +-#include <asm/system.h> /* cli(), *_flags */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) ++ #include <asm/system.h> /* cli(), *_flags */ ++#endif + #include <asm/segment.h> /* memcpy and such */ + #include <asm/io.h> + #include <asm/pgtable.h> diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch index be10e394707a..2e1f87d7c6ff 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch @@ -1,8 +1,9 @@ ---- svgalib-1.9.25/kernel/svgalib_helper/main.c.orig 2016-02-22 11:10:25.000000000 +0300 -+++ svgalib-1.9.25/kernel/svgalib_helper/main.c 2016-02-22 11:17:16.223529679 +0300 -@@ -170,8 +170,12 @@ +diff '--color=auto' -Naurd svgalib-1.9.25.prev/kernel/svgalib_helper/main.c svgalib-1.9.25/kernel/svgalib_helper/main.c +--- svgalib-1.9.25.prev/kernel/svgalib_helper/main.c 2020-05-02 09:50:14.751043144 +0300 ++++ svgalib-1.9.25/kernel/svgalib_helper/main.c 2020-05-02 09:51:44.564742599 +0300 +@@ -171,8 +171,12 @@ #else - static int svgalib_helper_ioctl(struct file *filp, + static long svgalib_helper_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) + struct inode *inode=file_inode(filp); @@ -13,7 +14,7 @@ io_t iov, *user_iov=(io_t *)arg; pcic_t pciv, *user_pciv=(pcic_t *)arg; -@@ -586,7 +590,11 @@ +@@ -587,7 +591,11 @@ static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) { unsigned long start=vma->vm_start; unsigned long end=vma->vm_end; diff --git a/media-libs/svgalib/files/svgalib-1.9.25-no-man-compression.patch b/media-libs/svgalib/files/svgalib-1.9.25-no-man-compression.patch new file mode 100644 index 000000000000..e88647412f09 --- /dev/null +++ b/media-libs/svgalib/files/svgalib-1.9.25-no-man-compression.patch @@ -0,0 +1,26 @@ +--- svgalib-1.9.25/doc/Makefile.orig 2005-07-02 20:21:57.000000000 +0400 ++++ svgalib-1.9.25/doc/Makefile 2020-05-02 00:15:00.104324667 +0300 +@@ -26,7 +26,7 @@ + SVGALIB=$(subst man,$(srcdir)/doc/man,$(SVGALIB1)) + VGAGL=$(subst man,$(srcdir)/doc/man,$(VGAGL1)) + THREED=$(subst man,$(srcdir)/doc/man,$(THREED1)) +-COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -name "*.gz" -type f -print) ++COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -type f -print) + + .PHONY: clean ascii dvi ps install gunzip gzip + +@@ -63,13 +63,12 @@ + cat $(VGAGL) | grep -v '^\.so ' | troff -man -T$@ > vgagl.$@ + cat $(THREED) | grep -v '^\.so ' | troff -man -T$@ > 3d.$@ + +-install: gzip ++install: + mkdir -p $(mandir)/man1 $(mandir)/man3 $(mandir)/man5 \ + $(mandir)/man6 $(mandir)/man7 $(mandir)/man8 + for i in $(COMPMANPAGES); do\ + $(INSTALL_DATA) $(srcdir)/doc/$$i $(mandir)/$$i; \ + done +- make gunzip + ifdef MAKEWHATIS + @echo "Rebuilding the whatis database (this is slow!)" + @echo "You can comment this out in Makefile.cfg!" diff --git a/media-libs/svgalib/files/svgalib-1.9.25-wrapdemo-buf-overflow.patch b/media-libs/svgalib/files/svgalib-1.9.25-wrapdemo-buf-overflow.patch new file mode 100644 index 000000000000..1ea9f6a5e1e7 --- /dev/null +++ b/media-libs/svgalib/files/svgalib-1.9.25-wrapdemo-buf-overflow.patch @@ -0,0 +1,14 @@ +Fix buffer overflow in palette when writing last non-used element: + +wrapdemo.c:256:29: warning: iteration 63 invokes undefined behavior [-Waggressive-loop-optimizations] +--- svgalib-1.9.25/threeDKit/wrapdemo.c.orig 2020-05-01 23:41:32.000000000 +0300 ++++ svgalib-1.9.25/threeDKit/wrapdemo.c 2020-05-01 23:41:55.911933032 +0300 +@@ -230,7 +230,7 @@ + can be 0, 64, 128, OR 192 */ + + int i; +- unsigned char palette[768]; ++ unsigned char palette[769]; + + for (i = 0; i < 64; i++) { + palette[i * 3] = i; diff --git a/media-libs/svgalib/svgalib-1.9.25-r6.ebuild b/media-libs/svgalib/svgalib-1.9.25-r6.ebuild new file mode 100644 index 000000000000..55f0bb10ddab --- /dev/null +++ b/media-libs/svgalib/svgalib-1.9.25-r6.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic linux-mod toolchain-funcs + +DESCRIPTION="A library for running svga graphics on the console" +HOMEPAGE="http://www.svgalib.org/" +SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~x86" +IUSE="build +kernel-helper" + +MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)" +BUILD_TARGETS="default" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch + "${FILESDIR}"/${PN}-1.9.19-pic.patch + "${FILESDIR}"/${PN}-1.9.25-build.patch + "${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch + "${FILESDIR}"/${PN}-1.9.25-glibc210.patch + "${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch + "${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch + "${FILESDIR}"/${PN}-1.9.25-vga_reset.patch + "${FILESDIR}"/${PN}-1.9.25-missing_include.patch + "${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch + "${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch + "${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch + "${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch +) + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KDIR=${KV_OUT_DIR}" +} + +src_prepare() { + default + sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die + convert_to_m kernel/svgalib_helper/Makefile +} + +src_compile() { + use kernel-helper || export NO_HELPER=y + + export CC=$(tc-getCC) + # C89 extern inlines are needed, see #576260 + append-cflags -fgnu89-inline + + # First build static + emake OPTIMIZE="${CFLAGS}" static + # Then build shared ... + emake OPTIMIZE="${CFLAGS}" shared + emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \ + textutils lrmi utils + # Build threeDKit ... + emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \ + -C threeDKit lib3dkit.a + # Build demo's ... + emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \ + demoprogs + + ! use build && use kernel-helper && linux-mod_src_compile +} + +src_install() { + local x + + dodir /etc/svgalib /usr/{include,lib,bin,share/man} + + emake \ + TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \ + install + ! use build && use kernel-helper && linux-mod_src_install + + insinto /usr/include + doins gl/vgagl.h + dolib.a staticlib/libvga.a + dolib.a staticlib/libvgagl.a + dolib.a threeDKit/lib3dkit.a + + insinto /usr/include + doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h + doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h + + insinto /lib/udev/rules.d + newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules + + exeinto /usr/lib/svgalib/demos + for x in "${S}"/demos/* ; do + [[ -x ${x} ]] && doexe ${x} + done + + cd "${S}"/threeDKit || die + exeinto /usr/lib/svgalib/threeDKit + local THREED_PROGS="plane wrapdemo" + doexe ${THREED_PROGS} + + cd "${ED}/usr/$(get_libdir)" || die + ln -s libvga.so.${PV} libvga.so.1 || die + ln -s libvgagl.so.${PV} libvgagl.so.1 || die + ln -s lib3dkit.so.${PV} lib3dkit.so.1 || die + ln -sf libvga.so.1 libvga.so || die + ln -sf libvgagl.so.1 libvgagl.so || die + ln -sf lib3dkit.so.1 lib3dkit.so || die + + cd "${S}" || die + dodoc 0-README + cd "${S}"/doc || die + dodoc CHANGES DESIGN TODO + docinto txt + dodoc Driver-programming-HOWTO add_driver svgalib.lsm \ + README.{joystick,keymap,multi-monitor,patching,vesa} + # avoid installation of a broken symlink + newdoc ../lrmi-0.6m/README README.lrmi +} + +pkg_postinst() { + ! use build && use kernel-helper && linux-mod_pkg_postinst +} |