diff options
author | 2016-01-16 17:25:30 +0000 | |
---|---|---|
committer | 2016-01-16 17:25:30 +0000 | |
commit | fad2330684b778d9f2e63b383342e340509e5902 (patch) | |
tree | 49cadeb6935db00f19eb764012488812c1b7e30b /dev-libs | |
parent | Add libva-vdpau-driver ebuild with patch to include <sys/time.h> (diff) | |
download | ennui-fad2330684b778d9f2e63b383342e340509e5902.tar.gz ennui-fad2330684b778d9f2e63b383342e340509e5902.tar.bz2 ennui-fad2330684b778d9f2e63b383342e340509e5902.zip |
Add pkgconfig support to libx86
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libx86/ChangeLog | 58 | ||||
-rw-r--r-- | dev-libs/libx86/ChangeLog-2015 | 86 | ||||
-rw-r--r-- | dev-libs/libx86/Manifest | 8 | ||||
-rw-r--r-- | dev-libs/libx86/files/libx86-0.99-ifmask.patch | 21 | ||||
-rw-r--r-- | dev-libs/libx86/files/libx86-1.1-add-pkgconfig.patch | 50 | ||||
-rw-r--r-- | dev-libs/libx86/files/libx86-1.1-makefile.patch | 28 | ||||
-rw-r--r-- | dev-libs/libx86/libx86-1.1-r99.ebuild | 46 | ||||
-rw-r--r-- | dev-libs/libx86/metadata.xml | 8 |
8 files changed, 305 insertions, 0 deletions
diff --git a/dev-libs/libx86/ChangeLog b/dev-libs/libx86/ChangeLog new file mode 100644 index 0000000..6fa1825 --- /dev/null +++ b/dev-libs/libx86/ChangeLog @@ -0,0 +1,58 @@ +# ChangeLog for dev-libs/libx86 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# (auto-generated from git log) + +*libx86-1.1-r3 (09 Aug 2015) +*libx86-1.1-r2 (09 Aug 2015) + + 09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> + +files/libx86-0.99-ifmask.patch, +files/libx86-1.1-makefile.patch, + +libx86-1.1-r2.ebuild, +libx86-1.1-r3.ebuild, +metadata.xml: + proj/gentoo: Initial commit + + This commit represents a new era for Gentoo: + Storing the gentoo-x86 tree in Git, as converted from CVS. + + This commit is the start of the NEW history. + Any historical data is intended to be grafted onto this point. + + Creation process: + 1. Take final CVS checkout snapshot + 2. Remove ALL ChangeLog* files + 3. Transform all Manifests to thin + 4. Remove empty Manifests + 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ + 5.1. Do not touch files with -kb/-ko keyword flags. + + Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration + tests + X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this + project + X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo + developer, wrote Git features for the migration + X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve + cvs2svn + X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts + X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 + work in migration + X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging + X-Thanks: All of other Gentoo developers - many ideas and lots of paint on + the bikeshed + + 24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: + Use https by default + + Convert all URLs for sites supporting encrypted connections from http to + https + + Signed-off-by: Justin Lecher <jlec@gentoo.org> + + 24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml: + Revert DOCTYPE SYSTEM https changes in metadata.xml + + repoman does not yet accept the https version. + This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. + + Bug: https://bugs.gentoo.org/552720 + diff --git a/dev-libs/libx86/ChangeLog-2015 b/dev-libs/libx86/ChangeLog-2015 new file mode 100644 index 0000000..3cf8dc6 --- /dev/null +++ b/dev-libs/libx86/ChangeLog-2015 @@ -0,0 +1,86 @@ +# ChangeLog for dev-libs/libx86 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.22 2013/03/26 11:44:11 ago Exp $ + + 26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> libx86-1.1-r3.ebuild: + Stable for x86, wrt bug #463036 + + 26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> libx86-1.1-r3.ebuild: + Stable for amd64, wrt bug #463036 + + 11 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> metadata.xml: + Assign myself as maintainer + +*libx86-1.1-r3 (11 Feb 2013) + + 11 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +libx86-1.1-r3.ebuild, + +files/libx86-1.1-makefile.patch: + Revision bump: install static libs optionally, wrt bug #456648 + + 10 Feb 2013; Michael Palimaka <kensington@gentoo.org> -libx86-1.1-r1.ebuild: + Remove old. + + 10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> libx86-1.1-r2.ebuild: + Stable for amd64, wrt bug #456546 + + 10 Feb 2013; Agostino Sarubbo <ago@gentoo.org> libx86-1.1-r2.ebuild: + Stable for x86, wrt bug #456546 + +*libx86-1.1-r2 (20 Nov 2012) + + 20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> +libx86-1.1-r2.ebuild: + eapi5, respect AR + + 27 Jun 2012; Michael Palimaka <kensington@gentoo.org> + -files/libx86-0.99-build.patch, -libx86-0.99.ebuild, -libx86-1.1.ebuild: + Remove old. + + 01 Jul 2009; Markus Meier <maekke@gentoo.org> libx86-1.1-r1.ebuild: + amd64 stable, bug #267719 + + 30 Jun 2009; Christian Faulhammer <fauli@gentoo.org> libx86-1.1-r1.ebuild: + stable x86, bug 267719 + + 15 Sep 2008; Peter Volkov <pva@gentoo.org> libx86-1.1-r1.ebuild: + Use correct compiler, bug #237383, thank Jeroen Roovers for notice. + +*libx86-1.1-r1 (10 Sep 2008) + + 10 Sep 2008; Peter Volkov <pva@gentoo.org> +libx86-1.1-r1.ebuild: + Respect LDFLAGS, bug #236888, thank Olivier Huber for report and fix. + + 06 Sep 2008; Ulrich Mueller <ulm@gentoo.org> + +files/libx86-0.99-ifmask.patch, libx86-0.99.ebuild, libx86-1.1.ebuild: + Fix compile failure with linux-headers-2.6.26, bug 235599. Thanks to + junki.gnu@gmail.com for the patch. + +*libx86-1.1 (06 Sep 2008) + + 06 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> +libx86-1.1.ebuild: + Version bump. This new version is vaccinated of the bug from bug #235599 + + 07 Aug 2008; Markus Meier <maekke@gentoo.org> libx86-0.99.ebuild: + amd64/x86 stable, bug #231739 + + 28 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml: + Removing Alon Bar-Lev (alonbl) from metadata.xml (as per #147110). Assigning + to maintainer-needed. + + 07 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: + Fix metadata typo. + + 10 Nov 2007; Samuli Suominen <drac@gentoo.org> libx86-0.99.ebuild: + Keyword ~amd64 wrt #197687. + + 10 Oct 2007; Alon Bar-Lev <alonbl@gentoo.org> + files/libx86-0.99-build.patch, libx86-0.99.ebuild: + Fix lib dir, bug#192814, thanks for Pacho Ramos for reporting + + 18 Sep 2007; Alon Bar-Lev <alonbl@gentoo.org> libx86-0.99.ebuild: + Add die thanks to vapier + +*libx86-0.99 (17 Sep 2007) + + 17 Sep 2007; Alon Bar-Lev <alonbl@gentoo.org> + +files/libx86-0.99-build.patch, +metadata.xml, +libx86-0.99.ebuild: + Initial add, bug#156431 diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest new file mode 100644 index 0000000..09ab8df --- /dev/null +++ b/dev-libs/libx86/Manifest @@ -0,0 +1,8 @@ +AUX libx86-0.99-ifmask.patch 584 SHA256 b8070e57c5d267b3736b133e4c3c92965cc5a62e72466b705b506ad2ce39dd25 SHA512 781ea16e535ca1c0a54552b51d67b0901102f20ab63ff5ff39f9f2bb513abb53867eb5e52089e72afa6c313380b2033881f17cfe233b09a38ed5a9e95ad8d5f8 WHIRLPOOL 148e94477662dd91e654972f8ad475808574e006677e3858346c864b580776ec203457d1011f05d984ba82231f8ebdddac46e8f9bd1e1650e831268c7abe0b66 +AUX libx86-1.1-add-pkgconfig.patch 1551 SHA256 de18116436db7e35011f5524071e3abb05e838fc24da4a53e2c1b16fe609ad40 SHA512 77a2eb5d063f2bae279abd4bb45a3a839448201c11eb6b68e59454f25265c450368952fcf8663727e5b7fd16438a4a95456cd44d91dc4748d215c2716529c9a8 WHIRLPOOL ce79d4c8d25c6de08ae7242fce3c89eae76b26d02696892762521475cfb6a564be8953a0fca457688ad168c40c9b68f67089b89d4aedd782f1d2074a5f66f74f +AUX libx86-1.1-makefile.patch 853 SHA256 ce7c23404e1ba95343418cc0256c7ad2db702b79518e4cda77c802dfbbce306f SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6 WHIRLPOOL 80d8a599a7fa6aa54f3a65076c5642f5281e79eb283215ced4da9e5523f74c21e17a26eb75b8957757b96f71b7f0a3eee5a0098b46099df2ac193c2577853a7e +DIST libx86-1.1.tar.gz 87428 SHA256 5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048 SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280 WHIRLPOOL 778dae64fb0a21988debb12ca43ca6eed94fc34ab8d0e012aa30914053f57e6817fc7bbec42f6a85a0be4399263c035f981708036804cb756875143f91fe227c +EBUILD libx86-1.1-r99.ebuild 1202 SHA256 3ada07db37e9464f5f8398036ac67b9d79f809a84c06d5715597121d440959a2 SHA512 b748d14d0b4b8f96f3ea0e187e963fd4bb732855b1bc062a50e8cd27e89b8d6e24da8a4310ffc7e825173b7a84af29ccd4005526d0a81f58d1785ade4310f5d5 WHIRLPOOL ea1d2808e0ec6d2fef97a13b416e66773bf350ccfbc887e180f54251fc801b25c404c82f24590724c9894e09a05c36f96ef325ad04fa9eb3f5c9f66b02016c84 +MISC ChangeLog 2170 SHA256 1703a1bfef5c503620f4014520ec6176fecf886844dbe085a463947624473d4d SHA512 c946edeb94f0918bb6647204b566d27063143910f6d27cfd209531572701de8363db79b00f3256a35c1d973530036f31ee3f6f57606aa21de537cdc84a55c3cb WHIRLPOOL 8039c8abd7586ef194945f09478cb54602ace2bd287ea907a576a4ac0d47331833f5288b0b3ffdbd3d3ceee0ee66ada04b82be4cdaecd37fb50d018f0a8e80d9 +MISC ChangeLog-2015 3104 SHA256 279a3b4a4d63f4703fdea67ac8381e730a82e74c9d5af424528d7b996405544f SHA512 db6c59484fc9d2b9771b1ae94c4b36916a9fe97359eff37682422548ec07575a939fc115516aaf8ba5d9166ec134e94c54f9804cb59abf19a2186e3ca5afa880 WHIRLPOOL 0a0a560262770a20a4634e86ddafcecd198c2e5fd7bcf647785e94d850e1ff88db14a940a0580ce87dcbb3c9bfc0a90bddb9f8f8bdcc2ab95155526fbcc87474 +MISC metadata.xml 233 SHA256 a93cf5c4e554b97b2a48b92f801e3a3d87833cac311db0160a387a757ab7054c SHA512 704c94018edcbc53edcf0a41c2603dd59ea217aa5871f35d4d17f7df26156b8fb0a735d2efb11b74256565db01e6790a833242de39c29a9e46ed8ed96d505334 WHIRLPOOL 57f455cf256b91fb72e642f5a861e7367961775f2ab992b8afc798ff376c9a2bc8860d09f2bc43c870531248484128c966f25a081b7789a31ba9fb4f52b5519c diff --git a/dev-libs/libx86/files/libx86-0.99-ifmask.patch b/dev-libs/libx86/files/libx86-0.99-ifmask.patch new file mode 100644 index 0000000..c99eeb8 --- /dev/null +++ b/dev-libs/libx86/files/libx86-0.99-ifmask.patch @@ -0,0 +1,21 @@ +--- lrmi.c.orig 2008-09-06 12:24:36.070136428 +0200 ++++ lrmi.c 2008-09-06 12:28:10.584287458 +0200 +@@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE. + #include "x86-common.h" + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#endif ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++#ifndef VIF_MASK ++#define VIF_MASK X86_EFLAGS_VIF ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) diff --git a/dev-libs/libx86/files/libx86-1.1-add-pkgconfig.patch b/dev-libs/libx86/files/libx86-1.1-add-pkgconfig.patch new file mode 100644 index 0000000..3490c7f --- /dev/null +++ b/dev-libs/libx86/files/libx86-1.1-add-pkgconfig.patch @@ -0,0 +1,50 @@ +diff -Naur libx86-1.1.orig/Makefile libx86-1.1/Makefile +--- libx86-1.1.orig/Makefile 2016-01-16 15:58:32.764389859 +0000 ++++ libx86-1.1/Makefile 2016-01-16 16:02:34.461849053 +0000 +@@ -1,6 +1,7 @@ + OBJECTS = x86-common.o + CFLAGS ?= -O2 -Wall -DDEBUG -g + LIBDIR ?= /usr/lib ++INCLUDEDIR ?= /usr/include + + ifeq ($(BACKEND),x86emu) + OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ +@@ -29,7 +30,14 @@ + rm -f *.o *~ + + clean: objclean +- rm -f *.so.1 *.a ++ rm -f *.so.1 *.a x86.pc ++ ++x86.pc: ++ sed -e's,@prefix@,/usr,' x86.pc.in > x86.pc ++ sed -e's,@exec_prefix@,/usr,' -i x86.pc ++ sed -e's,@libdir@,${LIBDIR},' -i x86.pc ++ sed -e's,@includedir@,${INCLUDEDIR},' -i x86.pc ++ sed -e's,@PACKAGE_VERSION@,1.1,' -i x86.pc + + install-shared: libx86.so.1 + install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1 +@@ -41,4 +49,7 @@ + install-static: + install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a + +-install: install-shared install-static install-header ++install-pkgconfig: x86.pc ++ install -D x86.pc $(DESTDIR)$(LIBDIR)/pkgconfig/x86.pc ++ ++install: install-shared install-static install-header install-pkgconfig +diff -Naur libx86-1.1.orig/x86.pc.in libx86-1.1/x86.pc.in +--- libx86-1.1.orig/x86.pc.in 1970-01-01 00:00:00.000000000 +0000 ++++ libx86-1.1/x86.pc.in 2016-01-16 15:59:27.171393640 +0000 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: x86 ++Description: Library providing x86 emulator access ++Version: @PACKAGE_VERSION@ ++Cflags: -I${includedir} ++Libs: -L${libdir} -lx86 diff --git a/dev-libs/libx86/files/libx86-1.1-makefile.patch b/dev-libs/libx86/files/libx86-1.1-makefile.patch new file mode 100644 index 0000000..471c3fb --- /dev/null +++ b/dev-libs/libx86/files/libx86-1.1-makefile.patch @@ -0,0 +1,28 @@ +--- Makefile.orig 2013-02-11 16:35:56.834368910 +0400 ++++ Makefile 2013-02-11 16:36:02.587369368 +0400 +@@ -22,7 +22,7 @@ + $(AR) cru libx86.a $(OBJECTS) + + shared: $(OBJECTS) +- $(CC) $(CFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS) + + objclean: + $(MAKE) -C x86emu clean +@@ -31,8 +31,14 @@ + clean: objclean + rm -f *.so.1 *.a + +-install: libx86.so.1 ++install-shared: libx86.so.1 + install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1 +- install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a + ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so ++ ++install-header: + install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h ++ ++install-static: ++ install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a ++ ++install: install-shared install-static install-header diff --git a/dev-libs/libx86/libx86-1.1-r99.ebuild b/dev-libs/libx86/libx86-1.1-r99.ebuild new file mode 100644 index 0000000..474bce3 --- /dev/null +++ b/dev-libs/libx86/libx86-1.1-r99.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="A hardware-independent library for executing real-mode x86 code" +HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86" +SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs" + +src_prepare() { + # fix compile failure with linux-headers-2.6.26, bug 235599 + epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch + # Patch for bugs #236888 and #456648 + epatch "${FILESDIR}"/${P}-makefile.patch + # Add support for pkgconfig (enables newer versions of vbetool to link against this) + epatch "${FILESDIR}"/${P}-add-pkgconfig.patch + + tc-export CC AR +} + +src_compile() { + local ARGS + use amd64 && ARGS="BACKEND=x86emu" + emake ${ARGS} LIBRARY=shared shared + if use static-libs; then + emake ${ARGS} objclean + emake ${ARGS} LIBRARY=static static + fi +} + +src_install() { + local install_static; + use static-libs && install_static='install-static' + emake \ + LIBDIR="/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + install-header install-shared install-pkgconfig ${install_static} +} diff --git a/dev-libs/libx86/metadata.xml b/dev-libs/libx86/metadata.xml new file mode 100644 index 0000000..b6b8956 --- /dev/null +++ b/dev-libs/libx86/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>pinkbyte@gentoo.org</email> + <name>Sergey Popov</name> + </maintainer> +</pkgmetadata> |