diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-07-16 04:06:12 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-16 04:06:12 +0000 |
commit | 3be6560004bb3f55c8dd119c0ce285522b3bfa03 (patch) | |
tree | 13c2a3d4756728bae12144f6a483e7ae8ea127df /media-libs/svgalib | |
parent | stabilize (diff) | |
download | historical-3be6560004bb3f55c8dd119c0ce285522b3bfa03.tar.gz historical-3be6560004bb3f55c8dd119c0ce285522b3bfa03.tar.bz2 historical-3be6560004bb3f55c8dd119c0ce285522b3bfa03.zip |
Version bump #140448 by Michael Cramer.
Package-Manager: portage-2.1.1_pre2-r8
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r-- | media-libs/svgalib/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/svgalib/Manifest | 56 | ||||
-rw-r--r-- | media-libs/svgalib/files/digest-svgalib-1.9.21-r1 | 2 | ||||
-rw-r--r-- | media-libs/svgalib/files/digest-svgalib-1.9.23 | 2 | ||||
-rw-r--r-- | media-libs/svgalib/files/digest-svgalib-1.9.25 | 3 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch | 42 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch | 108 | ||||
-rw-r--r-- | media-libs/svgalib/svgalib-1.9.25.ebuild | 149 |
8 files changed, 350 insertions, 21 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index b66b192e03f5..93f88e9ae062 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.69 2006/06/20 19:48:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.70 2006/07/16 04:06:12 vapier Exp $ + +*svgalib-1.9.25 (16 Jul 2006) + + 16 Jul 2006; Mike Frysinger <vapier@gentoo.org> + +files/svgalib-1.9.25-gentoo.patch, +files/svgalib-1.9.25-linux2.6.patch, + +svgalib-1.9.25.ebuild: + Version bump #140448 by Michael Cramer. 20 Jun 2006; Mike Frysinger <vapier@gentoo.org> files/svgalib-1.9.24-linux2.6.patch: diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index 5230b5e308ff..9accf8da7121 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -29,6 +29,14 @@ AUX svgalib-1.9.24-linux2.6.patch 4553 RMD160 16b3470b24595e781530cb0cafe0fc9f71 MD5 5bb3810d9312da4bfdebd50a07038b10 files/svgalib-1.9.24-linux2.6.patch 4553 RMD160 16b3470b24595e781530cb0cafe0fc9f71511e90 files/svgalib-1.9.24-linux2.6.patch 4553 SHA256 b17f37e1d5292dbe78d7c69d56931d7a496574de4e6cde8b4c7e8eca018678fd files/svgalib-1.9.24-linux2.6.patch 4553 +AUX svgalib-1.9.25-gentoo.patch 1298 RMD160 a3a19dda08ea60a7b410ee6dd2cffea667e355d7 SHA1 7cc719cf889193d0e9f4f94f3b4af1b1ef8bce3b SHA256 eaea5e2cd0e808279070c067f2d88a64fce5a5904bc7cdf36678f45876e27fb5 +MD5 b6162183ce7332f19e01ff9195d4d79b files/svgalib-1.9.25-gentoo.patch 1298 +RMD160 a3a19dda08ea60a7b410ee6dd2cffea667e355d7 files/svgalib-1.9.25-gentoo.patch 1298 +SHA256 eaea5e2cd0e808279070c067f2d88a64fce5a5904bc7cdf36678f45876e27fb5 files/svgalib-1.9.25-gentoo.patch 1298 +AUX svgalib-1.9.25-linux2.6.patch 3104 RMD160 913c4c2f09d8883193aa88ee838f0a0ce2e2dc17 SHA1 dda5343a412d982af75d5ac360dae5b92e5a9add SHA256 77fac0f6fc060ad0adde9002373f375cd296e91c1a57bf8ba85d3bb29b86f6d1 +MD5 827e312b2c12f0e2d4a1933ff76c0c61 files/svgalib-1.9.25-linux2.6.patch 3104 +RMD160 913c4c2f09d8883193aa88ee838f0a0ce2e2dc17 files/svgalib-1.9.25-linux2.6.patch 3104 +SHA256 77fac0f6fc060ad0adde9002373f375cd296e91c1a57bf8ba85d3bb29b86f6d1 files/svgalib-1.9.25-linux2.6.patch 3104 AUX svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b SHA1 c587ce84dff7f0e8f222660c004256b3b867d00a SHA256 3aa888f06d84d3ad49b9714986e43cad845082a1b2f6e06baa4637967920414a MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b files/svgalib.devfs 219 @@ -41,9 +49,10 @@ AUX svgalib.udev.rules.d 55 RMD160 05987efb133e53358a8f1aeb69895b8f44fb9f80 SHA1 MD5 d15d5d3cf26776d90faa44da5c9fa02a files/svgalib.udev.rules.d 55 RMD160 05987efb133e53358a8f1aeb69895b8f44fb9f80 files/svgalib.udev.rules.d 55 SHA256 ae60596a1b5fdc0e6cc9d625f363d869f8674e4da631cc341e663b22870f7d81 files/svgalib.udev.rules.d 55 -DIST svgalib-1.9.21.tar.gz 950274 -DIST svgalib-1.9.23.tar.gz 982053 -DIST svgalib-1.9.24.tar.gz 986612 RMD160 5ecab1a6945b8b3747850a0fa283fb2bf558e24d SHA256 12f74fd44c13991ece0fb4bb0d4d95366ba1de2758c7eec10b59290bc6237ca1 +DIST svgalib-1.9.21.tar.gz 950274 RMD160 b1aa727edfb796c523bcf6123734f8a0dc9e36fa SHA1 b13b405e1574331dccc4ad8deb372c09e87221af SHA256 5e053650e147ed0d0c16dc3956ec04318d1224628aad1c2d6194fcc1d8d1a2e5 +DIST svgalib-1.9.23.tar.gz 982053 RMD160 49915a5d4b0c2d81d46a721a48bc489747ccb43b SHA1 af4fc048ba589669fe54e0d528355e7612e5edcb SHA256 e3b85c40ac3cf532b4f3496fe477bfd0d077fd1c702b83356548c4375b4fae5a +DIST svgalib-1.9.24.tar.gz 986612 RMD160 5ecab1a6945b8b3747850a0fa283fb2bf558e24d SHA1 d3c182c4129af98394e1a6847157f410295d6f68 SHA256 12f74fd44c13991ece0fb4bb0d4d95366ba1de2758c7eec10b59290bc6237ca1 +DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 EBUILD svgalib-1.9.21-r1.ebuild 4619 RMD160 73865c87089435aebc8579263c2ec69e436b1cb7 SHA1 c553e76c9b84badf6f9d2218b1aeb1e4b2975887 SHA256 9de89ada00c33ab2fb5d1e3b0032bdebedd1c9c69b15819477522c0255a3d020 MD5 883ab8f536976b79259747f70b41046d svgalib-1.9.21-r1.ebuild 4619 RMD160 73865c87089435aebc8579263c2ec69e436b1cb7 svgalib-1.9.21-r1.ebuild 4619 @@ -52,31 +61,38 @@ EBUILD svgalib-1.9.23.ebuild 4510 RMD160 3edc7b2235fa0aca804aed68f7515aaa0f067f3 MD5 c26062ed56860238444ea04729203cf3 svgalib-1.9.23.ebuild 4510 RMD160 3edc7b2235fa0aca804aed68f7515aaa0f067f3f svgalib-1.9.23.ebuild 4510 SHA256 e033ee559947598e0b11002d48c03c9947d42392a083bb87d3dc56885f811229 svgalib-1.9.23.ebuild 4510 -EBUILD svgalib-1.9.24.ebuild 4575 RMD160 8657b34aadc3578b1247bbc02203c13416fcdda8 SHA1 c4e222bd19203537c0bbf3de29165a0da84ef95f SHA256 19205e1a5a6abd3907a9654845b712f74b9ff69b26a5dbeabe9a66001583c6fb -MD5 35d7cfd6d4ec4a1159aeb62b2a0ae71d svgalib-1.9.24.ebuild 4575 -RMD160 8657b34aadc3578b1247bbc02203c13416fcdda8 svgalib-1.9.24.ebuild 4575 -SHA256 19205e1a5a6abd3907a9654845b712f74b9ff69b26a5dbeabe9a66001583c6fb svgalib-1.9.24.ebuild 4575 -MISC ChangeLog 12278 RMD160 eedabea8db46f3b7a2cf236c8061235e98d169f4 SHA1 54a1eb3fbbf55183566bafd9bdfcc67408cf36ce SHA256 140de38daa4a81f79044415e571b54d00661d7a8da86fa189def0314b78d5495 -MD5 b991c10687c1595af3f5056ddf8a076a ChangeLog 12278 -RMD160 eedabea8db46f3b7a2cf236c8061235e98d169f4 ChangeLog 12278 -SHA256 140de38daa4a81f79044415e571b54d00661d7a8da86fa189def0314b78d5495 ChangeLog 12278 +EBUILD svgalib-1.9.24.ebuild 4574 RMD160 55f4f339f32971f21bad55567bfda8931618d9d3 SHA1 1eda0abb2899bd9ae6da5b76250d6fdf3a5b6f81 SHA256 3fcbdbadfc9cd2be20885369ad7b4342951694328f45ab11785a462c0785f003 +MD5 c02e2e2938cc26e5f24bf476cb64047e svgalib-1.9.24.ebuild 4574 +RMD160 55f4f339f32971f21bad55567bfda8931618d9d3 svgalib-1.9.24.ebuild 4574 +SHA256 3fcbdbadfc9cd2be20885369ad7b4342951694328f45ab11785a462c0785f003 svgalib-1.9.24.ebuild 4574 +EBUILD svgalib-1.9.25.ebuild 4369 RMD160 447ab36ffd09562205ad4ad708277fdc13fe6fcd SHA1 3a87ef2494b11e557dfea25ca807d749357e653a SHA256 8ff13ce937bc2b25e25af4a9966d8443f8e72b226f4eb2683edc0bb3b9a4d42a +MD5 2c22bad3fc7692124cbea65eb6f71292 svgalib-1.9.25.ebuild 4369 +RMD160 447ab36ffd09562205ad4ad708277fdc13fe6fcd svgalib-1.9.25.ebuild 4369 +SHA256 8ff13ce937bc2b25e25af4a9966d8443f8e72b226f4eb2683edc0bb3b9a4d42a svgalib-1.9.25.ebuild 4369 +MISC ChangeLog 12504 RMD160 33b15e4af322c87979c2d73d84800c59320d3ce4 SHA1 d74457effdd3a9ff85bb537c156bf4764677d1b6 SHA256 c9b23b3c6272473833fdc8f8ba70eab8c66162ced241f6e4a7789785532a047b +MD5 ec39f00f25da994bdbf30740bbba26d8 ChangeLog 12504 +RMD160 33b15e4af322c87979c2d73d84800c59320d3ce4 ChangeLog 12504 +SHA256 c9b23b3c6272473833fdc8f8ba70eab8c66162ced241f6e4a7789785532a047b ChangeLog 12504 MISC metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 SHA1 c273b6ce5b51e9d5690e54ae84982d9c2cf617d2 SHA256 08bfae407186f5088cd2b118396e784d8eaf7ab82ecc162cf8a73ff9cabcf717 MD5 69845288d94413820ea3441dc9e60b24 metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 metadata.xml 303 SHA256 08bfae407186f5088cd2b118396e784d8eaf7ab82ecc162cf8a73ff9cabcf717 metadata.xml 303 -MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21-r1 66 -RMD160 e2e501dd87f234f44c1188061b6b23ea244897c9 files/digest-svgalib-1.9.21-r1 66 -SHA256 0af66c49d844c14a76f3c5aaec2a9e14d7722fb033a1aa3af2438f086528a0d4 files/digest-svgalib-1.9.21-r1 66 -MD5 8121635a6e2d2be1c4b2067bc9d659f9 files/digest-svgalib-1.9.23 66 -RMD160 5da52c472de4b6e7b7e961e14517c56c1961e9b5 files/digest-svgalib-1.9.23 66 -SHA256 21e4e7d135a165cf44a7e19100b6bd7ffd63a1e818e3ba150e984c36f6b67202 files/digest-svgalib-1.9.23 66 +MD5 58bd6f624f558d9c957598b073c96ce8 files/digest-svgalib-1.9.21-r1 244 +RMD160 bc2b9793984d226a01fb976712006da1b5492cc8 files/digest-svgalib-1.9.21-r1 244 +SHA256 d235909f35bd9b1f9a928446c0d9b953a6ce755785530504e2c63263a120c186 files/digest-svgalib-1.9.21-r1 244 +MD5 e4ca8ca64f073ba62a3bcf360fac926f files/digest-svgalib-1.9.23 244 +RMD160 145efcc02eed8249160a7d229335f491c69267b1 files/digest-svgalib-1.9.23 244 +SHA256 d49c68c0bd18d433f11874c9b20c739e53ec5096f54c2703b7240df9c7eeacfa files/digest-svgalib-1.9.23 244 MD5 2fade38f6280418b878fc9ec6425b611 files/digest-svgalib-1.9.24 244 RMD160 cb17655aaf1caf0ec167a2faaf38fb1e9ced5e83 files/digest-svgalib-1.9.24 244 SHA256 e9aeec91a16ef008173ec45162e2680a29fdabee914c2a516acc1da133a98c86 files/digest-svgalib-1.9.24 244 +MD5 ce3612b32d5d810bc066f94884ad1651 files/digest-svgalib-1.9.25 244 +RMD160 b58d83ff0bf0aece90a1a8fac86924e53ba1a704 files/digest-svgalib-1.9.25 244 +SHA256 ddcc343b075e1ebcbceb0952eaa273fb40fd3a0bc00bb00b7d64e1c500a6cac4 files/digest-svgalib-1.9.25 244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEp2lfamhnQswr0vIRAlY8AJwICdALIh5xgAHGfPYGmpuDAcQStQCgoPAO -jWEnfCiDWtNmWIuFdI0nTfE= -=9nJJ +iD8DBQFEubt7amhnQswr0vIRAkSMAJ0TDhxhgDEC+U8QHDopQ7MzDQPXuACgg1Ms +dkDOSroqbxnOObHsHqLuWi0= +=qC1Y -----END PGP SIGNATURE----- diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 index b01ecc6bf94e..53a90c62b444 100644 --- a/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 +++ b/media-libs/svgalib/files/digest-svgalib-1.9.21-r1 @@ -1 +1,3 @@ MD5 1bd8892ee38481051e4b4d85008c86be svgalib-1.9.21.tar.gz 950274 +RMD160 b1aa727edfb796c523bcf6123734f8a0dc9e36fa svgalib-1.9.21.tar.gz 950274 +SHA256 5e053650e147ed0d0c16dc3956ec04318d1224628aad1c2d6194fcc1d8d1a2e5 svgalib-1.9.21.tar.gz 950274 diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.23 b/media-libs/svgalib/files/digest-svgalib-1.9.23 index bced2d75c1e3..01f6dac06d4e 100644 --- a/media-libs/svgalib/files/digest-svgalib-1.9.23 +++ b/media-libs/svgalib/files/digest-svgalib-1.9.23 @@ -1 +1,3 @@ MD5 b51f7c791f0a64a856beec283bcdc0ba svgalib-1.9.23.tar.gz 982053 +RMD160 49915a5d4b0c2d81d46a721a48bc489747ccb43b svgalib-1.9.23.tar.gz 982053 +SHA256 e3b85c40ac3cf532b4f3496fe477bfd0d077fd1c702b83356548c4375b4fae5a svgalib-1.9.23.tar.gz 982053 diff --git a/media-libs/svgalib/files/digest-svgalib-1.9.25 b/media-libs/svgalib/files/digest-svgalib-1.9.25 new file mode 100644 index 000000000000..c3a769adf1e2 --- /dev/null +++ b/media-libs/svgalib/files/digest-svgalib-1.9.25 @@ -0,0 +1,3 @@ +MD5 4dda7e779e550b7404cfe118f1d74222 svgalib-1.9.25.tar.gz 987084 +RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 svgalib-1.9.25.tar.gz 987084 +SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 svgalib-1.9.25.tar.gz 987084 diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch new file mode 100644 index 000000000000..5ee2a985b17b --- /dev/null +++ b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch @@ -0,0 +1,42 @@ +--- svgalib-1.9.25/Makefile.cfg ++++ svgalib-1.9.25/Makefile.cfg +@@ -44,7 +44,7 @@ CONFDIR = $(SRCDIR)/src/config + # Common prefix for installation directories. + # NOTE: This directory must exist when you start the install. + TOPDIR= +-prefix = $(TOPDIR)/usr/local ++prefix = $(TOPDIR)/usr + exec_prefix = $(prefix) + + # Directory where the shared stubs and static library will be installed. +--- svgalib-1.9.25/Makefile ++++ svgalib-1.9.25/Makefile +@@ -99,8 +99,6 @@ + (cd $(sharedlibdir); \ + ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \ + done +- @./fixldsoconf +- -ldconfig + + installstaticlib: static + @echo Installing static libraries in $(libdir). +--- svgalib-1.9.25/threeDKit/Makefile ++++ svgalib-1.9.25/threeDKit/Makefile +@@ -58,7 +58,6 @@ + $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION) + $(INSTALL_SHLIB) $< $(sharedlibdir)/$< + (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` ) +- -ldconfig + + install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders + +--- svgalib-1.9.25/src/Makefile ++++ svgalib-1.9.25/src/Makefile +@@ -453,7 +453,6 @@ + + $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION) + $(INSTALL_SHLIB) $< $(sharedlibdir)/$< +- -ldconfig + + install: $(sharedlibdir)/libvga.so.$(VERSION) + diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch new file mode 100644 index 000000000000..d01479c286bc --- /dev/null +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch @@ -0,0 +1,108 @@ + - get rid of warning when linux/device.h doesnt exist + - touch up the Makefile to let the ebuild handle the module details + - fix support with io remap stuff in newer kernels + - dont include headers that dont exist in 2.4.x kernels + - use module_param() for 2.6.x and MODULE_PARM() for all others + - dont declare all_devices as static since it is exported + +--- svgalib/kernel/svgalib_helper/Makefile ++++ svgalib/kernel/svgalib_helper/Makefile +@@ -25,7 +25,7 @@ + endif + + +-CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h) ++CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h 2>/dev/null) + + ifneq ($(CLASS_SIMPLE),) + CLASS_CFLAGS = -DCLASS_SIMPLE=1 +--- svgalib/kernel/svgalib_helper/Makefile.alt ++++ 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 + endif + + TARGET = svgalib_helper +@@ -50,7 +50,8 @@ + endif + endif + +-all: .depend $(OBJS) ++modules: $(OBJS) ++all: .depend modules + + $(TARGET).o: $(SRC:.c=.o) + $(LD) -r $^ -o $@ +@@ -61,8 +62,8 @@ + install: device modules_install + + modules_install: $(OBJS) +- mkdir -p /lib/modules/$(VER)/kernel/misc +- install -m 0644 -c $(OBJS) /lib/modules/$(VER)/kernel/misc ++ mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc ++ install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/kernel/misc + + device: + rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga? +--- svgalib/kernel/svgalib_helper/kernel26compat.h ++++ svgalib/kernel/svgalib_helper/kernel26compat.h +@@ -10,7 +10,7 @@ + # define PCI_GET_CLASS pci_find_class + # define PCI_GET_DEVICE pci_find_device + +-# if defined (PG_chainlock) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3) + # define my_io_remap_page_range(vma, start, ofs, len, prot) \ + io_remap_page_range(vma,start,ofs,len,prot) + # else +--- svgalib/kernel/svgalib_helper/main.c ++++ svgalib/kernel/svgalib_helper/main.c +@@ -19,13 +19,18 @@ + #include <linux/pci.h> + #include <linux/devfs_fs_kernel.h> + #include <linux/mm.h> ++#include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) + #include <linux/thread_info.h> ++#endif + #include <linux/smp.h> + #include <linux/smp_lock.h> + + #include <linux/sched.h> + #include <linux/wait.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) + #include <linux/syscalls.h> ++#endif + + #define __KERNEL_SYSCALLS__ + #include <linux/unistd.h> +@@ -55,7 +55,7 @@ + #include "displaystart.h" + + int debug=0; +-static int all_devices=0; ++int all_devices=0; + int num_devices=0; + + static char *sdev_id="svgalib_helper"; +@@ -770,10 +770,15 @@ + + } + ++#ifdef KERNEL_2_6 ++module_param(debug, int, 0); ++module_param(all_devices, int, 0); ++#else + MODULE_PARM(debug, "i"); +-MODULE_PARM_DESC(debug, "Debug output level."); +- + MODULE_PARM(all_devices, "i"); ++#endif ++ ++MODULE_PARM_DESC(debug, "Debug output level."); + MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class."); + diff --git a/media-libs/svgalib/svgalib-1.9.25.ebuild b/media-libs/svgalib/svgalib-1.9.25.ebuild new file mode 100644 index 000000000000..342aa0d379ea --- /dev/null +++ b/media-libs/svgalib/svgalib-1.9.25.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2006 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.ebuild,v 1.1 2006/07/16 04:06:12 vapier Exp $ + +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 no-helper" + +DEPEND="" + +MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)" +BUILD_TARGETS="default" +MODULESD_SVGALIB_HELPER_ADDITIONS="probeall /dev/svga svgalib_helper" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KDIR=${KV_OUT_DIR}" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Misc makefile clean ups + epatch "${FILESDIR}"/${PN}-1.9.25-gentoo.patch + + # Get it to work with kernel 2.6 + epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch + + # -fPIC does work for lrmi, see bug #51698 + epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch + + # Don't strip stuff, let portage do it + sed -i '/^INSTALL_PROGRAM/s: -s : :' Makefile.cfg +} + +src_compile() { + use no-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 no-helper && linux-mod_src_compile +} + +src_install() { + local x= + + dodir /etc/svgalib /usr/{include,lib,bin,share/man} + + make \ + TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \ + install || die "Failed to install svgalib!" + ! use build && ! use no-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 + + if best_version '>=sys-fs/udev-045' ; then + insinto /etc/udev/rules.d + newins "${FILESDIR}"/svgalib.udev.rules.d 30-svgalib.rules + elif best_version sys-fs/udev ; then + insinto /etc/udev/permissions.d + newins "${FILESDIR}"/svgalib.udev.perms.d 30-svgalib.permissions + elif best_version sys-fs/devfsd ; then + insinto /etc/devfs.d + newins "${FILESDIR}"/svgalib.devfs svgalib + fi + + 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 no-helper && linux-mod_pkg_postinst + [[ ${ROOT} != "/" ]] && return 0 + + if [[ -e /dev/.devfsd ]] ; then + ebegin "Restarting devfsd to reread devfs rules" + killall -HUP devfsd + eend $? + elif [[ -e /dev/.udev ]] ; then + ebegin "Restarting udev to reread udev rules" + udevstart + eend $? + fi +} |