commit: d429ef9bebe80ded1dbfa6e986831dc0be2f015c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Feb 21 23:28:00 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Feb 21 23:28:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d429ef9b
media-tv/xawtv: Remove from tree media-tv/xawtv/Manifest | 3 - media-tv/xawtv/files/webcamrc | 30 ---- media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch | 25 ---- .../files/xawtv-3.95-libquicktime-compat.patch | 27 ---- media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch | 42 ------ media-tv/xawtv/files/xawtv-3.95-stdbool.patch | 10 -- media-tv/xawtv/metadata.xml | 8 -- media-tv/xawtv/xawtv-3.95-r3.ebuild | 159 --------------------- profiles/package.mask | 6 - 9 files changed, 310 deletions(-) diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest deleted file mode 100644 index c8b6365..0000000 --- a/media-tv/xawtv/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6 SHA512 669e3c13ede19f62d69d099a57ca39fd3326608b5b794221d29b3abcc29b1098fd30e0dcde1d1420c9aec55f6ae16d0a262b606ab598f5b3ee522f8b5540c3e9 WHIRLPOOL 3503a868d558151657ddfbd2fba5768ef6377a08a9c16eb5e0bb4d6c0862c4af66fc36271a13093a5b5558980d46f3e83baaa034c763febd6b17199deaac5532 -DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f SHA512 9c793ee7fa233aafb12decbd9289f09cbad5aa828db1f4dd89a9999e71bebe5faacc4c361cd41cf928931f32310bdb0c24e52c2c7c8d5595c286c163727faa01 WHIRLPOOL a55089b733d34fa144e9e56f6ff856c3401206294d42d348a05b1128421884269cfb890d16718ac3f3cd70159d7d683b4b9375f92fa936ebeeb22b84d9fd1257 -DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e SHA512 4f7bf2ac7be1d487daaccaaf853e3ed6a388784d15e87413cbefa4fb2e04c324f5cdce498636d4bf83d70a698b343df877e1f3df9acd615932f361b4292f6dd5 WHIRLPOOL 8b8b72e7815c04470f430e2ba3c1e252782813af56cb9875b647b70e5379f2ce13d1fb5667a6274e472e6dbe1402069b20c36933e24312ab96fef4eb1847f09a diff --git a/media-tv/xawtv/files/webcamrc b/media-tv/xawtv/files/webcamrc deleted file mode 100644 index 6773a67..0000000 --- a/media-tv/xawtv/files/webcamrc +++ /dev/null @@ -1,30 +0,0 @@ - [ftp] - host = www - user = webcam - pass = xxxxxx - dir = public_html/images - file = webcam.jpeg - tmp = uploading.jpeg - passive = 1 - debug = 0 - auto = 0 - local = 0 - ssh = 0 - - [grab] - device = /dev/video0 - text = "webcam %Y-%m-%d %H:%M:%S" - infofile = filename - width = 320 - height = 240 - delay = 3 - input = composite1 - norm = pal - rotate = 0 - top = 0 - left = 0 - bottom = -1 - right = -1 - quality = 75 - trigger = 0 - once = 0 diff --git a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch deleted file mode 100644 index 2021985..0000000 --- a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch +++ /dev/null @@ -1,25 +0,0 @@ -http://bugs.gentoo.org/288158 -http://bugs.gentoo.org/479848 - ---- libng/plugins/conv-mjpeg.c -+++ libng/plugins/conv-mjpeg.c -@@ -229,6 +229,9 @@ - jpeg_set_quality(&h->mjpg_cinfo, ng_jpeg_quality, TRUE); - - h->mjpg_cinfo.raw_data_in = TRUE; -+ #if JPEG_LIB_VERSION >= 70 -+ h->mjpg_cinfo.do_fancy_downsampling = FALSE; -+ #endif - jpeg_set_colorspace(&h->mjpg_cinfo,JCS_YCbCr); - - h->mjpg_ptrs[0] = malloc(h->fmt.height*sizeof(char*)); -@@ -453,6 +456,9 @@ - h->buf = in; - jpeg_read_header(&h->mjpg_cinfo,1); - h->mjpg_cinfo.raw_data_out = 1; -+ #if JPEG_LIB_VERSION >= 70 -+ h->mjpg_cinfo.do_fancy_upsampling = FALSE; -+ #endif - - if (ng_debug > 1) - fprintf(stderr,"yuv: %dx%d - %d %d / %d %d / %d %d\n", diff --git a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch b/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch deleted file mode 100644 index a86c48d..0000000 --- a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- xawtv-3.95/libng/plugins/write-qt.c.old 2006-10-16 20:50:45.000000000 +0200 -+++ xawtv-3.95/libng/plugins/write-qt.c 2006-10-17 19:36:09.000000000 +0200 -@@ -348,10 +348,10 @@ - info[i]->name,info[i]->long_name); - for (j = 0; j < info[i]->num_fourccs; j++) - fprintf(stderr," fcc : %s\n",info[i]->fourccs[j]); -- for (j = 0; j < info[i]->num_encoding_colormodels; j++) -+ for (j = 0; j < lqt_num_colormodels(); j++) - fprintf(stderr," cmodel: %d [%s]\n", -- info[i]->encoding_colormodels[j], -- lqt_get_colormodel_string(info[i]->encoding_colormodels[j])); -+ lqt_get_colormodel(j), -+ lqt_get_colormodel_string(j)); - } - - /* sanity checks */ -@@ -378,8 +378,8 @@ - /* pick colormodel */ - fmtid = VIDEO_NONE; - cmodel = 0; -- for (j = 0; j < info[i]->num_encoding_colormodels; j++) { -- cmodel = info[i]->encoding_colormodels[j]; -+ for (j = 0; j < lqt_num_colormodels(); j++) { -+ cmodel = lqt_get_colormodel(j); - if (cmodel>= sizeof(cmodels)/sizeof(int)) - continue; - if (!cmodels[cmodel]) diff --git a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch deleted file mode 100644 index 7a1ff5e..0000000 --- a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Patch from Andreas Jochens -http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html - ---- a/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000 -+++ b/console/fbtools.c 2006-08-23 10:57:40.000000000 +0000 -@@ -21,8 +21,6 @@ - #include <linux/vt.h> - #include <linux/fb.h> - --#include <asm/page.h> -- - #include "fbtools.h" - - /* -------------------------------------------------------------------- */ -@@ -424,7 +422,7 @@ - goto err; - } - #endif -- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); -+ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1); - fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, - PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); - if (-1L == (long)fb_mem) { ---- a/console/matrox.c 2005-02-03 10:40:41.000000000 +0000 -+++ b/console/matrox.c 2006-08-23 11:09:51.000000000 +0000 -@@ -9,7 +9,6 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - --#include <asm/page.h> /* PAGE_SIZE */ - #include <linux/fb.h> - - #include "byteswap.h" -@@ -226,7 +225,7 @@ - return -1; - } - off = (unsigned long)fb_fix.mmio_start - -- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); -+ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1)); - bmmio += off; - mmio = (uint32_t*)bmmio; - return 0; diff --git a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch deleted file mode 100644 index b93bb11..0000000 --- a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- x11/blit.c -+++ x11/blit.c -@@ -13,6 +13,7 @@ - #include <pthread.h> - #include <sys/ipc.h> - #include <sys/shm.h> -+#include <stdbool.h> - - #include <X11/Xlib.h> - #include <X11/Intrinsic.h> diff --git a/media-tv/xawtv/metadata.xml b/media-tv/xawtv/metadata.xml deleted file mode 100644 index 8c450e1..0000000 --- a/media-tv/xawtv/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <use> - <flag name="xext">Enable use of XFree extensions (DGA,VidMode,DPMS)</flag> - <flag name="zvbi">Enable VBI Decoding Library for Zapping</flag> - </use> -</pkgmetadata> diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild deleted file mode 100644 index 429f21f..0000000 --- a/media-tv/xawtv/xawtv-3.95-r3.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils font autotools flag-o-matic - -PATCHLEVEL="4" - -IUSE="aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext" - -MY_FONT=tv-fonts-1.1 -DESCRIPTION="Small suite of video4linux related software" -HOMEPAGE="http://bytesex.org/xawtv/"; -SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz - X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 ) - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" - -RDEPEND=">=sys-libs/ncurses-5.1 - virtual/jpeg:0 - X? ( - x11-libs/libFS - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXt - x11-libs/libXext - x11-libs/libXrender - xext? ( - x11-libs/libXinerama - x11-libs/libXxf86dga - x11-libs/libXrandr - x11-libs/libXxf86vm - ) - x11-apps/xset - xv? ( x11-libs/libXv ) - ) - motif? ( >=x11-libs/motif-2.3:0 - app-text/recode ) - alsa? ( media-libs/alsa-lib ) - aalib? ( media-libs/aalib ) - dv? ( media-libs/libdv ) - lirc? ( app-misc/lirc ) - opengl? ( virtual/opengl ) - quicktime? ( media-libs/libquicktime ) - zvbi? ( media-libs/zvbi - media-libs/libpng:0 )" - -DEPEND="${RDEPEND} - X? ( - x11-apps/xset - x11-apps/bdftopcf - x11-proto/videoproto - xext? ( x11-proto/xineramaproto ) - )" - -pkg_setup() { - if use X; then - font_pkg_setup - fi -} - -src_prepare() { - if use X; then - cd "${WORKDIR}/${MY_FONT}" - epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch" - fi - cd "${S}" - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - epatch "${FILESDIR}/${P}-libquicktime-compat.patch" - epatch "${FILESDIR}/${P}-pagemask-fix.patch" - epatch "${FILESDIR}/${P}-jpeg-7.patch" - epatch "${FILESDIR}/${P}-stdbool.patch" - eautoreconf -} - -src_configure() { - # It tries to include FSlib.h directly, but this seems to have moved. - use X && has_version x11-libs/libFS && append-flags -I/usr/include/X11/fonts - - econf \ - $(use_with X x) \ - $(use_enable xext xfree-ext) \ - $(use_enable xv xvideo) \ - $(use_enable dv) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable motif) \ - $(use_enable quicktime) \ - $(use_enable alsa) \ - $(use_enable lirc) \ - $(use_enable opengl gl) \ - $(use_enable zvbi) \ - $(use_enable aalib aa) -} - -src_compile() { - emake verbose=yes - - if use X; then - cd "${WORKDIR}/${MY_FONT}" - emake -j1 DISPLAY= - fi -} - -src_install() { - make install DESTDIR="${D}" resdir="${D}"/usr/share/X11 || die - - # v4lctl is only installed automatically if the X USE flag is enabled - use X || \ - dobin x11/v4lctl - - dodoc Changes README* TODO "${FILESDIR}"/webcamrc - docinto cgi-bin - dodoc scripts/webcam.cgi - - use X || \ - rm -f "${D}"/usr/share/man/man1/{pia,propwatch}.1 \ - "${D}"/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \ - "${D}"/usr/share/{man,man/es}/man1/rootv.1 - - use motif || \ - rm -f "${D}"/usr/share/man/man1/{motv,mtt}.1 - - use zvbi || \ - rm -f "${D}"/usr/share/man/man1/{alevtd,mtt}.1 \ - "${D}"/usr/share/{man,man/es}/man1/scantv.1 - - use nls || \ - rm -f "${D}"/usr/share/man/fr \ - "${D}"/usr/share/man/es - - # The makefile seems to be fubar'd for some data - dodir /usr/share/${PN} - mv "${D}"/usr/share/*.list "${D}"/usr/share/${PN} - mv "${D}"/usr/share/Index* "${D}"/usr/share/${PN} - - if use X; then - cd "${WORKDIR}/${MY_FONT}" - insinto /usr/share/fonts/xawtv - doins *.gz fonts.alias - - font_xfont_config - fi -} - -pkg_postinst() { - if use X; then - ebegin "installing teletype fonts into /usr/share/fonts/xawtv" - cd /usr/share/fonts/xawtv - mkfontdir - eend - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index ce444c3..d03a371 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -276,12 +276,6 @@ www-apps/389-dsgw # #370021, #478614, #513964 sci-libs/libbufr -# Manuel Rüger <[email protected]> (24 Dec 2015) -# Effectively unmaintained, multiple bugs -# Bug 288611,358013,413987,468186,480854,528750,548480,566226 -# Masked for removal in 30 days. -media-tv/xawtv - # Fabian Groffen <[email protected]> (11 Dec 2015) # Release candidates for Exim 4.87 =mail-mta/exim-4.87_rc2
