rpms/psimedia/devel import.log, NONE, 1.1 psimedia-demo.patch, NONE, 1.1 psimedia.desktop, NONE, 1.1 psimedia.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
nucleo
nucleo at fedoraproject.org
Fri Jul 17 16:03:26 UTC 2009
- Previous message (by thread): rpms/emelfm2/F-11 .cvsignore, 1.20, 1.21 emelfm2.spec, 1.35, 1.36 sources, 1.20, 1.21 emelfm2-0.5.1-nostrip.patch, 1.1, NONE emelfm2-0.6.0-fix-segfault-on-upgrade.patch, 1.1, NONE
- Next message (by thread): rpms/perl-CGI-Application-Plugin-DebugScreen/F-11 import.log, NONE, 1.1 perl-CGI-Application-Plugin-DebugScreen.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nucleo
Update of /cvs/pkgs/rpms/psimedia/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6167/devel
Modified Files:
.cvsignore sources
Added Files:
import.log psimedia-demo.patch psimedia.desktop psimedia.spec
Log Message:
Initial import
--- NEW FILE import.log ---
psimedia-1_0_3-2_fc11:HEAD:psimedia-1.0.3-2.fc11.src.rpm:1247846472
psimedia-demo.patch:
configure | 47 +++++++++++++++++++++++++++++++++++++++++++++++
demo/main.cpp | 3 ++-
psimedia.pro | 1 +
3 files changed, 50 insertions(+), 1 deletion(-)
--- NEW FILE psimedia-demo.patch ---
--- psimedia-1.0.3/configure 2009-06-11 08:45:53.000000000 +0300
+++ psimedia-1.0.3/configure 2009-07-16 17:18:05.000000000 +0300
@@ -15,6 +15,8 @@
--help This help text.
Project options:
+ --prefix=[path] Base path for build/install. Default: /usr/local
+ --libdir=[path] Directory for libraries. Default: PREFIX/lib
--release Build with debugging turned off (default).
--debug Build with debugging turned on.
--debug-and-release Build two versions, with and without debugging
@@ -121,6 +123,16 @@
while [ $# -gt 0 ]; do
optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
case "$1" in
+ --prefix=*)
+ PREFIX=$optarg
+ shift
+ ;;
+
+ --libdir=*)
+ LIBDIR=$optarg
+ shift
+ ;;
+
--qtdir=*)
EX_QTDIR=$optarg
shift
@@ -170,11 +182,15 @@
esac
done
+PREFIX=${PREFIX:-/usr/local}
+LIBDIR=${LIBDIR:-$PREFIX/lib}
echo "Configuring PsiMedia ..."
if [ "$QC_VERBOSE" = "Y" ]; then
echo
+echo PREFIX=$PREFIX
+echo LIBDIR=$LIBDIR
echo EX_QTDIR=$EX_QTDIR
echo QC_RELEASE=$QC_RELEASE
echo QC_DEBUG=$QC_DEBUG
@@ -527,6 +543,32 @@
}
};
+//----------------------------------------------------------------------------
+// qc_conf
+//----------------------------------------------------------------------------
+class qc_conf : public ConfObj
+{
+public:
+ qc_conf(Conf *c) : ConfObj(c) {}
+ QString name() const { return "Psi Configuration"; }
+ QString shortname() const { return "conf"; }
+ QString checkString() const { return QString(); }
+ bool exec()
+ {
+ conf->addExtra(QString("PSI_PLUGINS_DIR=%1/psi/plugins").arg(conf->getenv("LIBDIR")));
+
+ QFile file("demo/config.h");
+ if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
+ QTextStream stream( &file );
+ stream << "#define PSI_PLUGINS_DIR \"" << conf->getenv("LIBDIR") << "/psi/plugins\"" << endl;
+ }
+
+ conf->addDefine("HAVE_CONFIG");
+
+ return true;
+ }
+};
+
EOT
cat >$1/modules_new.cpp <<EOT
o = new qc_qt4(conf);
@@ -574,6 +616,9 @@
o = new qc_internal_pkgconfig(conf, "speexdsp", "speexdsp >= 1.2rc1", VersionMin, "1.2rc1");
o->required = true;
o->disabled = false;
+ o = new qc_conf(conf);
+ o->required = true;
+ o->disabled = false;
EOT
cat >$1/conf4.h <<EOT
@@ -1565,6 +1610,8 @@
EOT
}
+export PREFIX
+export LIBDIR
export EX_QTDIR
export QC_RELEASE
export QC_DEBUG
--- psimedia-1.0.3/demo/main.cpp 2009-05-13 10:03:42.000000000 +0300
+++ psimedia-1.0.3/demo/main.cpp 2009-07-16 17:18:25.000000000 +0300
@@ -32,6 +32,7 @@
#include "psimedia.h"
#include "ui_mainwin.h"
#include "ui_config.h"
+#include "config.h"
#define BASE_PORT_MIN 1
#define BASE_PORT_MAX 65534
@@ -1354,7 +1355,7 @@
#endif
if(pluginFile.isEmpty())
- pluginFile = findPlugin("../gstprovider", "gstprovider");
+ pluginFile = findPlugin(PSI_PLUGINS_DIR , "gstprovider");
}
PsiMedia::loadPlugin(pluginFile, resourcePath);
--- psimedia-1.0.3/psimedia.pro 2009-03-05 04:01:58.000000000 +0200
+++ psimedia-1.0.3/psimedia.pro 2009-07-16 17:18:55.000000000 +0300
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
+CONFIG += ordered
SUBDIRS += gstprovider/gstelements/static
SUBDIRS += demo
--- NEW FILE psimedia.desktop ---
[Desktop Entry]
Name=PsiMedia Demo
GenericName=PsiMedia Demo
Comment=PsiMedia Demo
Exec=psimedia
Icon=
Terminal=false
Type=Application
Categories=Qt;AudioVideo;
--- NEW FILE psimedia.spec ---
Name: psimedia
Version: 1.0.3
Release: 2%{?dist}
Summary: Audio and video RTP services for Psi-like IM clients
Group: Applications/Multimedia
License: LGPLv2+
URL: http://delta.affinix.com/psimedia/
Source0: http://delta.affinix.com/download/psimedia/%{name}-%{version}.tar.bz2
Source1: psimedia.desktop
# Using %{_libdir}/psi/plugins directory for psimedia demo
Patch0: psimedia-demo.patch
Requires: psi >= 0.13
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
BuildRequires: gstreamer-plugins-base-devel >= 0.10.22
BuildRequires: liboil-devel >= 0.3
BuildRequires: speex-devel
BuildRequires: desktop-file-utils
%description
PsiMedia is a thick abstraction layer for providing audio and
video RTP services to Psi-like IM clients. The implementation
is based on GStreamer.
%prep
%setup -q
%patch0 -p1
%build
# Generated by qconf 1.5 ( http://delta.affinix.com/qconf/ )
./configure --libdir=%{_libdir} --prefix=%{_prefix} --verbose
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -D -m 755 gstprovider/libgstprovider.so $RPM_BUILD_ROOT%{_libdir}/psi/plugins/libgstprovider.so
install -D -m 755 demo/demo $RPM_BUILD_ROOT%{_bindir}/%{name}
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_libdir}/psi/plugins/libgstprovider.so
%changelog
* Fri Jul 17 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-2
- Fixed patch for using libdir in plugins path
- Group changed to Applications/Multimedia
* Mon Jul 6 2009 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-1
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psimedia/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 17 Jul 2009 15:49:24 -0000 1.1
+++ .cvsignore 17 Jul 2009 16:02:56 -0000 1.2
@@ -0,0 +1 @@
+psimedia-1.0.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psimedia/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 17 Jul 2009 15:49:25 -0000 1.1
+++ sources 17 Jul 2009 16:02:56 -0000 1.2
@@ -0,0 +1 @@
+1be71c37d71c655ffc2c53cf86c77a7a psimedia-1.0.3.tar.bz2
- Previous message (by thread): rpms/emelfm2/F-11 .cvsignore, 1.20, 1.21 emelfm2.spec, 1.35, 1.36 sources, 1.20, 1.21 emelfm2-0.5.1-nostrip.patch, 1.1, NONE emelfm2-0.6.0-fix-segfault-on-upgrade.patch, 1.1, NONE
- Next message (by thread): rpms/perl-CGI-Application-Plugin-DebugScreen/F-11 import.log, NONE, 1.1 perl-CGI-Application-Plugin-DebugScreen.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list