summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-im/psimedia
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
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
Diffstat (limited to 'net-im/psimedia')
-rw-r--r--net-im/psimedia/Manifest1
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch51
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch52
-rw-r--r--net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch86
-rw-r--r--net-im/psimedia/metadata.xml13
-rw-r--r--net-im/psimedia/psimedia-1.0.3-r3.ebuild77
6 files changed, 280 insertions, 0 deletions
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
new file mode 100644
index 000000000000..58f57cb37f03
--- /dev/null
+++ b/net-im/psimedia/Manifest
@@ -0,0 +1 @@
+DIST psimedia-1.0.3.tar.bz2 236134 SHA256 019d18034fa94299d896448841d129fd1bad5f58daeb2aba7be540a7d06fb23b
diff --git a/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch b/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch
new file mode 100644
index 000000000000..e65951932946
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-drop-v4lsrc-gst-plugin.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/show_bug.cgi?id=361419#c5
+
+--- gstprovider/devices.cpp 2009-06-09 10:12:11.000000000 +0200
++++ gstprovider/devices.cpp 2011-04-02 11:47:21.898041830 +0200
+@@ -90,7 +90,6 @@
+ element_name == "alsasink" ||
+ element_name == "osssrc" ||
+ element_name == "osssink" ||
+- element_name == "v4lsrc" ||
+ element_name == "v4l2src" ||
+ element_name == "osxaudiosrc" ||
+ element_name == "osxaudiosink" ||
+@@ -224,11 +223,6 @@
+ if(type == PDevice::VideoIn)
+ element_name = "osxvideosrc";
+ }
+- else if(driver == "v4l")
+- {
+- if(type == PDevice::VideoIn)
+- element_name = "v4lsrc";
+- }
+ else if(driver == "v4l2")
+ {
+ if(type == PDevice::VideoIn)
+@@ -380,7 +374,7 @@
+ bool first = true;
+ foreach(const DeviceEnum::Item &i, list)
+ {
+- if(type == PDevice::VideoIn && (element_name == "v4lsrc" || element_name == "v4l2src"))
++ if(type == PDevice::VideoIn && element_name == "v4l2src")
+ {
+ if(!test_video(element_name, i.id))
+ continue;
+@@ -444,7 +438,6 @@
+ else // PDevice::VideoIn
+ {
+ drivers
+- << "v4l"
+ << "v4l2"
+ << "osxvideo"
+ << "winks";
+--- gstprovider/gstthread.cpp 2009-05-17 19:55:27.000000000 +0200
++++ gstprovider/gstthread.cpp 2011-04-02 11:48:28.581514484 +0200
+@@ -235,7 +235,6 @@
+ #elif defined(Q_OS_LINUX)
+ reqelem
+ << "alsasrc" << "alsasink"
+- << "v4lsrc"
+ << "v4l2src";
+ #elif defined(Q_OS_UNIX)
+ reqelem
diff --git a/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch b/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch
new file mode 100644
index 000000000000..01a42cac12f5
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch
@@ -0,0 +1,52 @@
+Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h
++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
+@@ -21,7 +21,7 @@
+ #ifndef GSTCUSTOMELEMENTS_H
+ #define GSTCUSTOMELEMENTS_H
+
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gst/gst.h>
+ #include <gst/base/gstpushsrc.h>
+ #include <gst/video/video.h>
+Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h
++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
+@@ -21,7 +21,7 @@
+ #ifndef PSI_GSTELEMENTS_H
+ #define PSI_GSTELEMENTS_H
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+Index: psimedia-1.0.3/gstprovider/gstthread.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/gstthread.h
++++ psimedia-1.0.3/gstprovider/gstthread.h
+@@ -22,7 +22,7 @@
+ #define PSI_GSTTHREAD_H
+
+ #include <QThread>
+-#include <glib/gmain.h>
++#include <glib.h>
+
+ namespace PsiMedia {
+
+Index: psimedia-1.0.3/gstprovider/rwcontrol.h
+===================================================================
+--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h
++++ psimedia-1.0.3/gstprovider/rwcontrol.h
+@@ -28,7 +28,7 @@
+ #include <QMutex>
+ #include <QWaitCondition>
+ #include <QTimer>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include "psimediaprovider.h"
+ #include "rtpworker.h"
+
diff --git a/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch b/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch
new file mode 100644
index 000000000000..b6076d12cbf2
--- /dev/null
+++ b/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch
@@ -0,0 +1,86 @@
+http://pkgs.fedoraproject.org/gitweb/?p=psimedia.git;a=blob_plain;f=psimedia-remove-v4l.patch;hb=HEAD
+
+--- gstprovider/deviceenum/deviceenum_unix.cpp
++++ gstprovider/deviceenum/deviceenum_unix.cpp
+@@ -35,7 +35,7 @@
+ # include <sys/stat.h>
+ # include <dirent.h>
+ # include <sys/ioctl.h>
+-# include <linux/videodev.h>
++# include <linux/videodev2.h>
+ #endif
+
+ namespace DeviceEnum {
+@@ -478,72 +478,7 @@
+ // v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
+ static QList<Item> get_v4l_items()
+ {
+-#ifdef Q_OS_LINUX
+- QList<Item> out;
+-
+- QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
+- if(list.isEmpty())
+- list = get_v4l_names("/proc/video/dev", false);
+-
+- // if we can't find anything, then do a raw scan for possibilities
+- if(list.isEmpty())
+- {
+- QStringList possible = scan_for_videodevs("/dev");
+- foreach(QString str, possible)
+- {
+- V4LName v;
+- v.dev = str;
+- list += v;
+- }
+- }
+-
+- for(int n = 0; n < list.count(); ++n)
+- {
+- V4LName &v = list[n];
+-
+- // if we already have a friendly name then we'll skip the confirm
+- // in order to save resources. the only real drawback here that
+- // I can think of is if the device isn't a capture type. but
+- // what does it mean to have a V4L device that isn't capture??
+- if(v.friendlyName.isEmpty())
+- {
+- int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
+- if(fd == -1)
+- continue;
+-
+- // get video capabilities and close
+- struct video_capability caps;
+- memset(&caps, 0, sizeof(caps));
+- int ret = ioctl(fd, VIDIOCGCAP, &caps);
+- close(fd);
+- if(ret == -1)
+- continue;
+-
+- if(!(caps.type & VID_TYPE_CAPTURE))
+- continue;
+-
+- v.friendlyName = caps.name;
+- }
+-
+- Item i;
+- i.type = Item::Video;
+- i.dir = Item::Input;
+- i.name = v.friendlyName;
+- i.driver = "v4l";
+- i.id = v.dev;
+-
+- // HACK
+- if(v.friendlyName == "Labtec Webcam Notebook")
+- i.explicitCaptureSize = QSize(640, 480);
+-
+- out += i;
+- }
+-
+- return out;
+-#else
+- // return empty list if non-linux
+ return QList<Item>();
+-#endif
+ }
+
+ static QList<Item> get_v4l2_items()
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
new file mode 100644
index 000000000000..c30d109ee800
--- /dev/null
+++ b/net-im/psimedia/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-im</herd>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>nikoli@gmx.us</email>
+ <name>Nikoli</name>
+</maintainer>
+<use>
+ <flag name='demo'>build simple test application for the PsiMedia system</flag>
+</use>
+</pkgmetadata>
diff --git a/net-im/psimedia/psimedia-1.0.3-r3.ebuild b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..85b1a693aebc
--- /dev/null
+++ b/net-im/psimedia/psimedia-1.0.3-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2 multilib
+
+DESCRIPTION="Psi plugin for voice/video calls"
+HOMEPAGE="http://delta.affinix.com/psimedia/"
+SRC_URI="http://delta.affinix.com/download/psimedia/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+IUSE="demo"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18
+ >=media-libs/gstreamer-0.10.22:0.10
+ >=media-libs/gst-plugins-base-0.10.22:0.10
+ media-libs/gst-plugins-good:0.10
+ >=dev-libs/liboil-0.3
+ >=dev-qt/qtgui-4.4:4
+ >=media-libs/speex-1.2_rc1
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/gst-plugins-speex:0.10
+ >=media-plugins/gst-plugins-vorbis-0.10.22:0.10
+ >=media-plugins/gst-plugins-theora-0.10.22:0.10
+ >=media-plugins/gst-plugins-alsa-0.10.22:0.10
+ >=media-plugins/gst-plugins-ogg-0.10.22:0.10
+ media-plugins/gst-plugins-v4l2:0.10
+ media-plugins/gst-plugins-jpeg:0.10
+ net-im/psi
+ !<net-im/psi-0.13_rc1
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die
+ # Don't build demo if we don't need that.
+ use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; }
+ # Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
+ epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch
+ epatch "${FILESDIR}"/${P}-drop-v4lsrc-gst-plugin.patch
+
+ epatch "${FILESDIR}"/${P}-glib2.32.patch
+}
+
+src_configure() {
+ # qconf generated configure script...
+ ./configure --no-separate-debug-info || die
+
+ eqmake4
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/psi/plugins
+ doins gstprovider/libgstprovider.so
+
+ if use demo; then
+ exeinto /usr/$(get_libdir)/${PN}
+ newexe demo/demo ${PN}
+
+ # Create /usr/bin/psimedia
+ cat <<-EOF > "demo/${PN}"
+ #!/bin/bash
+
+ export PSI_MEDIA_PLUGIN=/usr/$(get_libdir)/psi/plugins/libgstprovider.so
+ /usr/$(get_libdir)/${PN}/${PN}
+ EOF
+
+ dobin demo/${PN}
+ fi
+}