diff options
author | Pacho Ramos <pacho@gentoo.org> | 2012-09-14 20:29:28 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2012-09-14 20:29:28 +0000 |
commit | 4839c3cbdf005a7cc41c74b8322a80777f5767aa (patch) | |
tree | 982ebf0078911018fd3b84d7f5cb3b13ed302718 | |
parent | Drop old. (diff) | |
download | historical-4839c3cbdf005a7cc41c74b8322a80777f5767aa.tar.gz historical-4839c3cbdf005a7cc41c74b8322a80777f5767aa.tar.bz2 historical-4839c3cbdf005a7cc41c74b8322a80777f5767aa.zip |
Drop old, thanks to Andrew Savchenko for remembering.
Package-Manager: portage-2.1.11.14/cvs/Linux x86_64
-rw-r--r-- | media-libs/svgalib/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/svgalib/Manifest | 17 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch | 17 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch | 30 | ||||
-rw-r--r-- | media-libs/svgalib/svgalib-1.9.25-r1.ebuild | 127 |
5 files changed, 10 insertions, 187 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 12871d38fc75..4b1b4e72e3cd 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.97 2012/07/22 08:57:14 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.98 2012/09/14 20:29:28 pacho Exp $ + + 14 Sep 2012; Pacho Ramos <pacho@gentoo.org> -files/svgalib-1.9.25-fPIC.patch, + -files/svgalib-1.9.25-linux2.6.36.patch, -svgalib-1.9.25-r1.ebuild: + Drop old, thanks to Andrew Savchenko for remembering. 22 Jul 2012; Jeff Horelick <jdhore@gentoo.org> svgalib-1.9.25-r4.ebuild: marked x86 per bug 427542 diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index 7e77f29e4b3c..c72db88f2641 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -1,32 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX svgalib-1.9.19-pic.patch 487 SHA256 cbce8a1067b6618300de8b1934dd72a28130eba6953938434333dab3b29c8358 SHA512 313488478d487ce4e3e5cda64c2cba2b65dae12c768f0ec91da6365d5c0b939061f5ab489c7d19e2d8579534653da990c2e7e5a2e2f58ca4bd0b28076d22657e WHIRLPOOL 665eb68ab94748328efd4a08d408d9fa8a286df76d7d7e2db501b9ecf815fe1e19e15f1b5c184809d813fa4a30cc704d43ab0f08f98a55dcf1cc7c985dfc0900 AUX svgalib-1.9.25-build.patch 2163 SHA256 f2d5033376e02f4424a7d6252dd442eb2f6b6a3834244d8830248b7c651da361 SHA512 87cb6458bb427d2e73bc275d6e77987919587dec1b2f52944191087e628aaa4eba46148bf8cd2f89f5c51a5c9f5433f3262d378173ed16e894fd962d8bada4e5 WHIRLPOOL 73422218cd8ca16f1fb9d1fa1b5efda1a7885f1593460f02a923f4f3afe1ff512b87cf91905c8d11562e494926ba208d60c2d294cbcbd357cf6fe55b9397fc48 AUX svgalib-1.9.25-build2.patch 747 SHA256 dd89edb6a63e07f42c31db5844166261808d01d4d4271922e06854a6973c248d SHA512 9baf930a3da15340f3f6823bcb45242bdf6b53d60d4ea2e9ef81af42e748838d40b2d5973821005decd3d44375508838fe852c89d1b704e57b790c042907ba94 WHIRLPOOL 1f9df2862ee5f98e517f1aef68ccaad5d9c4393f119092e37625d926a910ac06db15569a083d8c3c9955f04b3bc700f47a74c2c9c07eb668fdb624b120fd5824 -AUX svgalib-1.9.25-fPIC.patch 499 SHA256 6a6d0100aa7d9f4b6f5557338a5c5ca6adb5264b01c51f5f55be142f285823b4 SHA512 4f470c4621ef8703ee083722ea15f1dd251216f71025837b6a09403353c22b1ad693dac3c43c4ce30387d8f935d81cb251d236012326485984e637a7557ecdac WHIRLPOOL bec6dd413276d462860ad91b3906ccf5558d98a7b93002c31ade157771e7f6252c11af726642b916a40b03c886c660576afddf7c087acc6a8fb4bbcb510e1627 AUX svgalib-1.9.25-glibc210.patch 3842 SHA256 d8ac6b82406e9d85fbd7ce3f35ee94a3bb77b729352d62f51d51931c46a2a434 SHA512 43813c240eaff58d993c0ed839bee0d5d73515e4954e7793536a981d149c882808ea79187b0bfe8511afcde78fd31b6e9ad94aaf20d28c8e96577d5f0e530d96 WHIRLPOOL 633cc0b0978067f6cdb9e60f56b1de2d061c83f02e94a8ea107f45bfd1c0b4b768320b50c48f4235f6979639145fc88268e60a5911e0fb268aa4b2cd67b4698c AUX svgalib-1.9.25-kernel3.4.patch 1125 SHA256 8ce6db9fe60ac28a29765d2108ef6cb3d6cedea13bfecf0e3da424b3913fc8b0 SHA512 35e035cfbe65823d8e5836653a058eb78bf3483c62a05dcad5a2aac3ac1ad47f63a7994c140d5b526bdf2e6edcfc5916452009cec056f73db664c0ffd3ba5857 WHIRLPOOL caaca99d95bda632c060f4f85b3086bc754b19c818e27e39de704d6ea1839cb2611143476e9bbc9159e339f7b4b388dedad0c92d4c04d9732601d552e9ab05a2 AUX svgalib-1.9.25-linux2.6.28.patch 1672 SHA256 79e3b78faadc7fc4a0f965e8ce7564c0a391293105a5bcd88ce44a77543af512 SHA512 ba3fcfb870768bc5d7e2d7acfe0381d6602b2e42d40e1d8b37246a60343e6e2f0b251c2a5fb32467773b565f4a0f38fdd5cba7c51fdf7fd36b0e5b988fcf2416 WHIRLPOOL d7ce90c9102b2a818461e25230b0d39f947e827e32184122378dbf8fd4cc92b872fdd6f67f883765e18f303237c9fbcf7c4c158649943e21c4594affcea72492 AUX svgalib-1.9.25-linux2.6.36-r1.patch 1244 SHA256 1445663954f46a4a60777a9e8f8966f3c7e711327a921c6b65b0bef16961a1d2 SHA512 23eac7a7ad7d66c4e124af2f46d17162b33ed4ad96350c0210a32bfd1ee60155f1f4bfe3aea269f88bd2dab47d931c4eb6a4e1387c41a9a4c7bb917b95662a3e WHIRLPOOL 4a20d785c946ec1d540b80030c93b9628f5159ad40d3d58a50e7bd749465479c5796cda0c54f9d0673f143e86474cd6c65cb6228ac0b7983e91955255e40f79c -AUX svgalib-1.9.25-linux2.6.36.patch 1115 SHA256 9d4094612b4ed221cabb20534c3caf9fe9efad2467962d788d6fb16b8c368a9f SHA512 bf0a039bf76f3a407f54e1c59fa796b42045f6277a7dc83984b08d7af571ea07efdf29c0dfe2264b2fb6cf8fe0e5542b754df39cf086d5c58e1e15d22f9e2d64 WHIRLPOOL b78a4464de09dab7d17b836caf5299e204283edc7f5b1c204c665a6a97d08d4a499ccc77a23c52898a572f1e1016ba77f3975a2aa26b27d7c68ef3da3b0dc915 AUX svgalib-1.9.25-linux2.6.patch 9547 SHA256 553b4c81a87a9c584377cae2795849b5237ca07e6bf0bef5ffc00ebb0b9a1160 SHA512 b2a1105735398f7f1f452612947a66c85bc0eca5c1e7f0d56f154d980dbfcf23bea2d5038145e6e004afb7658d7d3ab2de655a408da7c6853d8fdc817f775191 WHIRLPOOL 0ee822c679b4677c173fb7528807d61f0ea0c9b4595fad224273601527ebe68fbbd550988020b308d0ad70d82f98cd7010521a2451f71a2294fde53ecb7d56c7 AUX svgalib-1.9.25-qa.patch 1157 SHA256 78fd351b98d0a148052e94dcd674f354e34f46b70b58da0534d54e3064703945 SHA512 e0bc82f1c27f7d6003be8ce4e96005605dad73ff22086ceb0861d60931776ecaf86f4bca15b0f4a6e5f5ab5b5ec50d8fa305f53bb090f122ea38d88569834b8b WHIRLPOOL a6e4ac24acaca2b27d6f04e2ba875bcfe16584d2027a8db44029c2e57f3cd3f3ae1e52bdebfd7805b75501f2a9b87857e9404425d0641f7377549f90db8ce312 AUX svgalib-1.9.25-segfault.patch 302 SHA256 9956316596b51dd189d82940289e07be60391260382585e0fcfd8e3f6ee432c9 SHA512 e238a5e05db06623abe04a6058345a4c4b91953c73ef02c3b4bd0b4606f9a57f2b20ef18aa2a91c50465bd3c048ba2ffd4792d62dcfadd94320afffa826641f1 WHIRLPOOL 2e5e761ca8010e3f259287f0d58634f63e6d5528e949fc4bd18828312e6d538664c51bde5b09e184fad16d51a69255f746c23e22ec88deaad652d948d3f980ca AUX svgalib.udev.rules.d.2 44 SHA256 08973143b979ff88ff49701d7173cb6fb9661ea9c8f3911efc031435b648cc96 SHA512 41336ddd1fc2a033c684dee1a442ee20ed58fdd1395346913502e4b0c5f798ad0e4cffe69de3dcdfa993dc8b480910c422d38e0483eacfea8f8ad24c41060c82 WHIRLPOOL 04badca6a832a7178b592d4b7a78649e43c52f22525263f268b623f1e64a6d68f8680ed709943cbc0944716f7169a25be60ea21f128499fb16e37a897aa45c6e DIST svgalib-1.9.25.tar.gz 987084 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 SHA512 697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7 WHIRLPOOL 7956941849ff5d3516681736b224246c11345c6982f074fb58f1145c9c24b9a539334a47d6596bd0c524c0b9d09e0ee713cec0e6d531be9f981c7556cf7615e1 -EBUILD svgalib-1.9.25-r1.ebuild 3824 SHA256 cb8fea8df71e69c8aaf068ed5e41187ca786405a493817a3cfc73e153dcd9a11 SHA512 2213562ab228b5e46b3f8f76b19aeb20f0955429a31d0a74faad493041dc68f6a6ffbfeaf349b05a7149af81f608cfeb828fe2eb2c6a103b43757d58f434e886 WHIRLPOOL 786e381ea324f74645f5d7d82d0a4cad3ba1a0e5a745c7f1c51f880d5401784f68e5b146fc31652c948710f57e3b67cdb46856920b4c00a0f036aee347a3d4ab EBUILD svgalib-1.9.25-r4.ebuild 4081 SHA256 5a2f5ead42fe328416d20c12b3a232dd7ee5d605118a13cd074ceeb9d105bbb1 SHA512 9bf84260a17403bce9b675132817b96baef09cb0e58e6262ce9fab9ad27bb81c51099280a9de82360e23da9eadd58a5a1ed5b7c0e5a076c22ba37acf65e1bc32 WHIRLPOOL 92766d752132c061b5995df0ac8d1a6c193b283740fcb310b19ae4455c53e539287520196d1af90af53eaee4d62604ca0f6af12b7847fb32ea286cbb9ec7ab76 -MISC ChangeLog 17050 SHA256 81989b131fd3a2602eca9c4a1db5baa842b7bba1e685b8999587deba5a015fb5 SHA512 e6da65c3798bdc82c9ec3ca555ab3aced4955cc7e5843bcdf3a0fdaa20841950ee7ec2f303d502c6203c956da15e4614d41700570ee580cbd997789dbd0b6a31 WHIRLPOOL 33f302d55b55202640338dd461c1d621a97242ab79de3a737b9ca2b2b1853c0d96dab4c54f2afc365ecfdd6da5e9559c16ee449b9b2e197da0cc53dd8bd71399 +MISC ChangeLog 17256 SHA256 fabd92ceaf069a2c3d674a8dfcaaa3cac125baf8c6a2aa859c3302f9ebc916e7 SHA512 3f26441be0623e074e9ecbf07740aa3c4f7f53611ce0f26f28a3a3c8117aadeed4e7b8c7b627a403ebbb67d2c732fbd15ea53ca1641019db1887f6dd258fa6bb WHIRLPOOL 14b4dedd7b89d399efaa7ba2e808afe317dd64871980eea4763960be1f27e38ccfa63aa8a04e479bf6f4905b302f0894c17e96fd1fc0069899a488f9a4d3c379 MISC metadata.xml 563 SHA256 013981488ee5703eef32fafc772c5d79fbe987c157a004ed7d9e7cef9f8b5cd9 SHA512 9a63a50b2399e4a3599476680d48bf5f3ddc91db67faabe1ef56bac8d82f0592876740de5349781a7e90771eb98365f05777c08c935a9239af208e3776d30dd6 WHIRLPOOL 29d0ab0d89ac30e4980428f40722bb5bb79956c1763c81741853cabcc60b832b4ed7e2b6844d68c5f06cd5979d6a4683dae6b3e43c48e4b92ce4d0c510ef92a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCgAGBQJQC8BwAAoJEPUd7O0j6ekAjGEH/i0s8glPEIZjIkKVj8AbHMmj -vl9GgMvMFkhmDRCGctmW9xtvbBOK0gPOYvbvnta2JtvRxZE47HievDd8m5L7eqwT -0FhcCNzoGbCbzB2nAieUwc5n18Bob5phMC+PpH/QO99cXrdB/HJHj4dZIr5Sx/Mx -jFh/tgromFDIBQ2ouPxlrJ2C8F4xxgN0dYoIovQQMcKkFK6rRaKrVat6ZB1RSQPX -z78FyH1rPmJEeYQu2uptrE4kEuNnwp5pjLkpauN85RiiP0DekS7L+D1YEju3VWhB -Q8Pt194g3IQ/y64aP0ByitXLzqOIfsgRNH2hjprIUgClRK+5oWZIi3hvaIj+Ot0= -=qa0f +iEYEAREIAAYFAlBTk64ACgkQCaWpQKGI+9ROagCeKZcNRv73Qpmy/uWL2aR302V6 ++OwAn3ydNtL3xn6LCq+BTqd5ZfJTVHxd +=87XV -----END PGP SIGNATURE----- diff --git a/media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch b/media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch deleted file mode 100644 index ab0e1c9ef7b3..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch +++ /dev/null @@ -1,17 +0,0 @@ -#DPATCHLEVEL=1 ---- svgalib-1.4.3.orig/src/Makefile -+++ svgalib-1.4.3/src/Makefile -@@ -471,9 +471,11 @@ - vga.o: vga.c - $(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $< - --#lrmi must NOT be compiled as -fPIC -+# XXX: Upstream used this so it may break, disabled to close an RC -+# lrmi must NOT be compiled as -fPIC - lrmi.o: lrmi.c -- $(CC) $(CFLAGS:-fPIC=) -c -o $@ $< -+ $(CC) $(CFLAGS) -c -o $@ $< -+# $(CC) $(CFLAGS:-fPIC=) -c -o $@ $< - - $(RAMDAC): %.o: %.c - $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $< diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch deleted file mode 100644 index eed935ebef4d..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c -+++ svgalib-1.9.25/kernel/svgalib_helper/main.c -@@ -163,8 +163,15 @@ static void task_startad(void *data) { - get_user(pciv.val, &user_pciv->val); - #define PUT_PCIV \ - put_user(pciv.val, &user_pciv->val); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) - static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) { -+#else -+static int svgalib_helper_ioctl(struct file *filp, -+ unsigned int cmd, unsigned long arg) { -+ -+ struct inode *inode=filp->f_dentry->d_inode; -+#endif - - io_t iov, *user_iov=(io_t *)arg; - pcic_t pciv, *user_pciv=(pcic_t *)arg; -@@ -595,7 +602,11 @@ struct file_operations svgalib_helper_fo - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) - .owner = THIS_MODULE, - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) - .ioctl = svgalib_helper_ioctl, -+#else -+ .unlocked_ioctl = svgalib_helper_ioctl, -+#endif - .mmap = svgalib_helper_mmap, - .open = svgalib_helper_open, - .release = svgalib_helper_release, diff --git a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild b/media-libs/svgalib/svgalib-1.9.25-r1.ebuild deleted file mode 100644 index 8f96ac536a1f..000000000000 --- a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r1.ebuild,v 1.4 2011/10/03 17:01:40 mr_bones_ Exp $ - -EAPI=1 - -inherit eutils flag-o-matic toolchain-funcs linux-mod - -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" - -DEPEND="" -RDEPEND="" - -MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)" -BUILD_TARGETS="default" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KDIR=${KV_OUT_DIR}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch - epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698 - epatch "${FILESDIR}"/${PN}-1.9.25-build.patch - epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch - epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305 - epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.36.patch - sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die -} - -src_compile() { - use kernel-helper || export NO_HELPER=y - - export CC=$(tc-getCC) - - # First build static - make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!" - # Have to remove for shared to build ... - rm -f src/svgalib_helper.h - # Then build shared ... - make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!" - # Missing in some cases ... - ln -s libvga.so.${PV} sharedlib/libvga.so - # Build lrmi and tools ... - make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \ - textutils lrmi utils \ - || die "Failed to build libraries and utils!" - # Build the gl stuff tpp - make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!" - make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \ - || die "Failed to build libvgagl.so.${PV}!" - # Missing in some cases ... - ln -s libvgagl.so.${PV} sharedlib/libvgagl.so - rm -f src/svgalib_helper.h - make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \ - || die "Failed to build libvga.so.${PV}!" - cp -pPR src/libvga.so.${PV} sharedlib/ - # Build threeDKit ... - make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \ - -C threeDKit lib3dkit.a || die "Failed to build threeDKit!" - # Build demo's ... - make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \ - demoprogs || die "Failed to build 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 || die "Failed to install svgalib!" - ! use build && use kernel-helper && linux-mod_src_install - - insinto /usr/include - doins gl/vgagl.h - dolib.a staticlib/libvga.a || die "dolib.a libvga" - dolib.a gl/libvgagl.a || die "dolib.a libvgagl" - dolib.a threeDKit/lib3dkit.a - dolib.so gl/libvgagl.so.${PV} || die "dolib.so libvgagl.so" - local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg) - for x in lib3dkit libvga libvgagl ; do - dosym ${x}.so.${PV} /usr/lib/${x}.so - dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver} - done - - insinto /usr/include - doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h - doins src/keyboard/vgakeyboard.h - - insinto /etc/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 - exeinto /usr/lib/svgalib/threeDKit - local THREED_PROGS="plane wrapdemo" - doexe ${THREED_PROGS} - - cd "${S}" - dodoc 0-README - cd "${S}"/doc - dodoc CHANGES DESIGN TODO - docinto txt - dodoc Driver-programming-HOWTO README.* add_driver svgalib.lsm -} - -pkg_postinst() { - ! use build && use kernel-helper && linux-mod_pkg_postinst -} |