From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- media-gfx/fbv/Manifest | 1 + media-gfx/fbv/fbv-1.0b.ebuild | 55 +++++++++++++++ media-gfx/fbv/files/fbv-1.0b-cc.patch | 97 ++++++++++++++++++++++++++ media-gfx/fbv/files/fbv-1.0b-libpng15.patch | 20 ++++++ media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff | 13 ++++ media-gfx/fbv/metadata.xml | 11 +++ 6 files changed, 197 insertions(+) create mode 100644 media-gfx/fbv/Manifest create mode 100644 media-gfx/fbv/fbv-1.0b.ebuild create mode 100644 media-gfx/fbv/files/fbv-1.0b-cc.patch create mode 100644 media-gfx/fbv/files/fbv-1.0b-libpng15.patch create mode 100644 media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff create mode 100644 media-gfx/fbv/metadata.xml (limited to 'media-gfx/fbv') diff --git a/media-gfx/fbv/Manifest b/media-gfx/fbv/Manifest new file mode 100644 index 000000000000..3abed6ec90d2 --- /dev/null +++ b/media-gfx/fbv/Manifest @@ -0,0 +1 @@ +DIST fbv-1.0b.tar.gz 18989 SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild new file mode 100644 index 000000000000..1a8170510d30 --- /dev/null +++ b/media-gfx/fbv/fbv-1.0b.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils toolchain-funcs + +DESCRIPTION="simple program to view pictures on a linux framebuffer device" +HOMEPAGE="http://freshmeat.net/projects/fbv/" +SRC_URI="http://s-tech.elsat.net.pl/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 arm ~ppc ppc64 sh x86" +IUSE="gif jpeg png" + +RDEPEND="gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg ) + png? ( media-libs/libpng )" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch \ + "${FILESDIR}"/oob-segfault-fbv-${PV}.diff \ + "${FILESDIR}"/${P}-libpng15.patch \ + "${FILESDIR}"/${P}-cc.patch + + sed -i -e 's:-lungif:-lgif:g' configure Makefile || die +} + +src_configure() { + local myconf="--without-bmp" + + use png || myconf="${myconf} --without-libpng" + use gif || myconf="${myconf} --without-libungif" + use jpeg || myconf="${myconf} --without-libjpeg" + + ./configure \ + --cc="$(tc-getCC)" \ + --libs="${LDFLAGS}" \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + ${myconf} || die +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin fbv + doman fbv.1 + dodoc ChangeLog README TODO VERSION +} diff --git a/media-gfx/fbv/files/fbv-1.0b-cc.patch b/media-gfx/fbv/files/fbv-1.0b-cc.patch new file mode 100644 index 000000000000..531148f10816 --- /dev/null +++ b/media-gfx/fbv/files/fbv-1.0b-cc.patch @@ -0,0 +1,97 @@ +# --- T2-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# T2 SDE: package/.../fbv/cc.patch +# Copyright (C) 2007 The T2 SDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- T2-COPYRIGHT-NOTE-END --- + +Imported from Atmel. + + - Rene Rebe + +diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure +--- fbv-1.0b/configure 2004-09-07 13:29:27.000000000 +0200 ++++ fbv-1.0b-avr32/configure 2006-05-04 11:10:06.000000000 +0200 +@@ -21,6 +21,7 @@ + unset png + unset bmp + unset dfb ++unset CC + + help(){ + cat << EOF >&2 +@@ -33,6 +34,7 @@ + General: + --help print this message + --libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG) ++ --cc=CC specify compiler to use + + Directory and file names: + --prefix=PREFIX install files in PREFIX [/usr/local] +@@ -53,7 +55,7 @@ + --long help,\ + prefix:,srcdir:,bindir:,\ + infodir:,mandir:,\ +-without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \ ++without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \ + -n "$BASENAME" -- "$@") + + if [ $? != 0 ] ; then help ; exit 1 ; fi +@@ -65,6 +67,7 @@ + case "$1" in + -h|--help) help ; exit 0 ;; + --libs) libs="$2"; shift 2 ;; ++ --cc) CC="$2"; shift 2 ;; + --prefix) prefix="$2" ; shift 2 ;; + --srcdir) srcdir="$2" ; shift 2 ;; + --bindir) bindir="$2" ; shift 2 ;; +@@ -80,6 +83,7 @@ + esac + done + ++[ -z "$CC" ] && CC=cc + [ -z "$prefix" ] && prefix="/usr/local" + [ -z "$bindir" ] && bindir="${prefix}/bin" + [ -z "$mandir" ] && mandir="${prefix}/man" +@@ -106,12 +110,12 @@ + ungif="no" + echo "libungif check" >>./config.log + echo " 1st:" >>./config.log +-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs ++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs + if [ -e \$\$~test ]; then + libs="-lungif $libs" ; ungif="yes" + else + echo " 2nd: -lX11 -L$xdir/lib" >>./config.log +- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs ++ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs + if [ -e \$\$~test ]; then + libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes" + fi +@@ -124,7 +128,7 @@ + echo -n "checking for libjpeg presence... " + if [ "$jpeg" != "disabled" ]; then + jpeg="no" +-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs ++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs + if [ -e \$\$~test ]; then + libs="-ljpeg $libs" ; jpeg="yes" + fi +@@ -135,7 +139,7 @@ + echo -n "checking for libpng presence... " + if [ "$png" != "disabled" ]; then + png="no" +-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs ++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs + if [ -e \$\$~test ]; then + libs="-lpng $libs" ; png="yes" + fi diff --git a/media-gfx/fbv/files/fbv-1.0b-libpng15.patch b/media-gfx/fbv/files/fbv-1.0b-libpng15.patch new file mode 100644 index 000000000000..dffbe48c3734 --- /dev/null +++ b/media-gfx/fbv/files/fbv-1.0b-libpng15.patch @@ -0,0 +1,20 @@ +--- png.c ++++ png.c +@@ -69,7 +69,7 @@ + fclose(fh); return(FH_ERROR_FORMAT); + } + rp=0; +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if(rp) free(rp); +@@ -161,7 +161,7 @@ + fclose(fh); return(FH_ERROR_FORMAT); + } + rp=0; +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if(rp) free(rp); diff --git a/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff b/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff new file mode 100644 index 000000000000..8713cb6635a8 --- /dev/null +++ b/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff @@ -0,0 +1,13 @@ +Index: fb_display.c +=================================================================== +--- fb_display.c (revision 4) ++++ fb_display.c (working copy) +@@ -92,7 +92,7 @@ + #if 0 + blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs, bp); + #else +- blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres_virtual, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp); ++ blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp); + #endif + free(fbbuff); + diff --git a/media-gfx/fbv/metadata.xml b/media-gfx/fbv/metadata.xml new file mode 100644 index 000000000000..c3e2245a9d41 --- /dev/null +++ b/media-gfx/fbv/metadata.xml @@ -0,0 +1,11 @@ + + + + + maintainer-needed@gentoo.org + + + + fbv + + -- cgit v1.2.3-65-gdbad