Author: fcrozat
Date: Fri Feb 9 16:29:55 2007
New Revision: 118488
Added:
packages/cooker/nucleo/current/SOURCES/nucleo-0.6-avahi.patch
packages/cooker/nucleo/current/SOURCES/nucleo-0.6-fixplugins.patch
Modified:
packages/cooker/nucleo/current/SPECS/nucleo.spec
Log:
- Enable SD_DNS support, QT4 plugin
- Move ffmpeg and QT4 plugins in separate packages
- Patch3(CVS) : fix plugins name
- Patch4: fix DNS_SD build with Avahi
Added: packages/cooker/nucleo/current/SOURCES/nucleo-0.6-avahi.patch
==============================================================================
--- (empty file)
+++ packages/cooker/nucleo/current/SOURCES/nucleo-0.6-avahi.patch Fri Feb
9 16:29:55 2007
@@ -0,0 +1,103 @@
+--- nucleo-0.6/apps/videoServer/Makefile.am.avahi 2005-11-13
15:47:31.000000000 +0100
++++ nucleo-0.6/apps/videoServer/Makefile.am 2007-02-09 15:17:25.000000000
+0100
+@@ -9,8 +9,8 @@
+ # this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+
+-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
+-AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
++AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
++AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
+
+ bin_PROGRAMS = videoServer
+
+--- nucleo-0.6/apps/Makefile.am.avahi 2006-02-27 11:10:20.000000000 +0100
++++ nucleo-0.6/apps/Makefile.am 2007-02-09 15:17:25.000000000 +0100
+@@ -11,8 +11,8 @@
+
+ SUBDIRS = videoServer
+
+-AM_CPPFLAGS = -I${top_srcdir}/ -I${top_builddir}
+-AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
++AM_CPPFLAGS = -I${top_srcdir}/ -I${top_builddir} $(DNS_SD_CPPFLAGS)
++AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
+
+ bin_PROGRAMS = videoClient
+
+--- nucleo-0.6/demos/misc/Makefile.am.avahi 2006-12-11 22:00:53.000000000
+0100
++++ nucleo-0.6/demos/misc/Makefile.am 2007-02-09 15:17:25.000000000 +0100
+@@ -9,8 +9,8 @@
+ # this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+
+-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
+-AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
++AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
++AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
+
+ noinst_PROGRAMS = documentOpener disBonjour
+
+--- nucleo-0.6/demos/video/Makefile.am.avahi 2007-01-15 22:07:30.000000000
+0100
++++ nucleo-0.6/demos/video/Makefile.am 2007-02-09 15:17:25.000000000 +0100
+@@ -9,8 +9,8 @@
+ # this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+
+-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
+-AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
++AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
++AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
+
+ noinst_PROGRAMS = blender collage timeoverlay src2files
+
+--- nucleo-0.6/nucleo/network/dnssd/Makefile.am.avahi 2007-01-15
16:33:27.000000000 +0100
++++ nucleo-0.6/nucleo/network/dnssd/Makefile.am 2007-02-09
15:17:25.000000000 +0100
+@@ -9,7 +9,7 @@
+ # this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+
+-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
++AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
+
+ noinst_LTLIBRARIES = libdnssd.la
+
+--- nucleo-0.6/tests/Makefile.am.avahi 2007-01-16 14:17:04.000000000 +0100
++++ nucleo-0.6/tests/Makefile.am 2007-02-09 15:17:25.000000000 +0100
+@@ -9,8 +9,8 @@
+ # this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ #
+
+-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
+-AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
++AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
++AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
+
+ noinst_PROGRAMS = \
+ test-reducePath \
+--- nucleo-0.6/configure.ac.avahi 2007-01-15 16:45:54.000000000 +0100
++++ nucleo-0.6/configure.ac 2007-02-09 15:46:22.000000000 +0100
+@@ -230,11 +230,21 @@
+ HAVE_DNS_SD=1
+ AC_CHECK_HEADERS([dns_sd.h], [],
+ [HAVE_DNS_SD=0; with_dns_sd="no"; problem_dns_sd=" (dns_sd.h not found)"])
+-if test x$TARGET != xDARWIN; then
+- AC_CHECK_LIB(dns_sd, DNSServiceRegister, [],
+- [HAVE_DNS_SD=0; with_dns_sd="no"; problem_dns_sd=" (dns_sd library not
found)"])
++if test x$TARGET != xDARWIN ; then
++ MY_PKG_CONFIG_CHECK([avahi-compat-libdns_sd], HAVE_DNS_SD, DNS_SD)
++ if test $HAVE_DNS_SD = 0 -a "x$HAVE_DNS_SD_H" = "x1" ; then
++ AC_CHECK_LIB(dns_sd, DNSServiceRegister, [],
++ [HAVE_DNS_SD=0; with_dns_sd="no"; problem_dns_sd=" (dns_sd library not
found)"])
++ fi
++ if test $HAVE_DNS_SD = 1 ; then
++ problem_dns_sd=""
++ with_dns_sd="yes"
++ fi
+ fi
+ AC_SUBST(HAVE_DNS_SD)
++AC_SUBST(DNS_SD_CPPFLAGS)
++AC_SUBST(DNS_SD_LDFLAGS)
++AC_SUBST(DNS_SD_LIBS)
+ AC_DEFINE_UNQUOTED(HAVE_DNS_SD,$HAVE_DNS_SD,[DNS_SD support])
+ AM_CONDITIONAL(HAVE_DNS_SD,[test "x$HAVE_DNS_SD" = "x1"])
+
Added: packages/cooker/nucleo/current/SOURCES/nucleo-0.6-fixplugins.patch
==============================================================================
--- (empty file)
+++ packages/cooker/nucleo/current/SOURCES/nucleo-0.6-fixplugins.patch Fri Feb
9 16:29:55 2007
@@ -0,0 +1,62 @@
+reverted:
+--- nucleo/nucleo/plugins/ffmpeg/Makefile.am 22 Jan 2007 13:42:23 -0000
1.16
++++ nucleo/nucleo/plugins/ffmpeg/Makefile.am 8 Feb 2007 16:22:31 -0000
1.17
+@@ -11,26 +11,26 @@
+
+ AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} @FFMPEG_CPPFLAGS@
+
++#lib_LTLIBRARIES = libnPffmpeg.la
+-lib_LTLIBRARIES = libnPffmpeg.la
+ pkglib_LTLIBRARIES = nPffmpeg.la
+
+ # the module
+ nPffmpeg_la_SOURCES = ffmpegImageSource.cxx ffmpegImageSink.cxx
++nPffmpeg_la_LDFLAGS = -module -avoid-version @FFMPEG_LDFLAGS@
+-nPffmpeg_la_LDFLAGS = -module @FFMPEG_LDFLAGS@
+ nPffmpeg_la_LIBADD = @FFMPEG_LIBS@
+
+ # the library
++#libnPffmpeg_la_SOURCES = ffmpegImageSource.cxx ffmpegImageSink.cxx
++#libnPffmpeg_la_LDFLAGS = -version 0:0:0 @FFMPEG_LDFLAGS@
++#libnPffmpeg_la_LIBADD = @FFMPEG_LIBS@
+-libnPffmpeg_la_SOURCES = ffmpegImageSource.cxx ffmpegImageSink.cxx
+-libnPffmpeg_la_LDFLAGS = -version 0:0:0 @FFMPEG_LDFLAGS@
+-libnPffmpeg_la_LIBADD = @FFMPEG_LIBS@
+
+ if DARWIN
+ nPffmpeg_la_LDFLAGS += -Wl,-read_only_relocs,suppress
++#libnPffmpeg_la_LDFLAGS += -Wl,-read_only_relocs,suppress
+-libnPffmpeg_la_LDFLAGS += -Wl,-read_only_relocs,suppress
+ endif
+
++#libnPffmpegincludedir = $(includedir)/nucleo/plugins/ffmpeg
++#libnPffmpeginclude_HEADERS = ffmpegImageSource.H ffmpegImageSink.H
+-libnPffmpegincludedir = $(includedir)/nucleo/plugins/ffmpeg
+-libnPffmpeginclude_HEADERS = ffmpegImageSource.H ffmpegImageSink.H
+
+ noinst_SCRIPTS = plugin-descr
+
+reverted:
+--- nucleo/nucleo/plugins/qt/Makefile.am 7 Feb 2007 11:37:59 -0000
1.4
++++ nucleo/nucleo/plugins/qt/Makefile.am 8 Feb 2007 16:22:31 -0000
1.5
+@@ -18,7 +18,7 @@
+
+ dist_nPqt_la_SOURCES = qtReactiveEngine.cxx qtFileKeeper.cxx qtTimeKeeper.cxx
+ nodist_nPqt_la_SOURCES = moc_qtReactiveEngine.cxx moc_qtTimeKeeper.cxx
moc_qtFileKeeper.cxx
++nPqt_la_LDFLAGS = -module -avoid-version @QT_LDFLAGS@
+-nPqt_la_LDFLAGS = -module @QT_LDFLAGS@
+ nPqt_la_LIBADD = @QT_LIBS@
+
+ moc_%.cxx: %.H
+reverted:
+--- nucleo/nucleo/plugins/vnc/Makefile.am 13 Nov 2005 14:47:31 -0000
1.9
++++ nucleo/nucleo/plugins/vnc/Makefile.am 8 Feb 2007 16:22:31 -0000
1.10
+@@ -16,7 +16,7 @@
+
+ # the module
+ nPvnc_la_SOURCES = vncImageSource.cxx
++nPvnc_la_LDFLAGS = -module -avoid-version @VNC_LDFLAGS@
+-nPvnc_la_LDFLAGS = -module @VNC_LDFLAGS@
+ nPvnc_la_LIBADD = -lrfb
+
+ # the library
Modified: packages/cooker/nucleo/current/SPECS/nucleo.spec
==============================================================================
--- packages/cooker/nucleo/current/SPECS/nucleo.spec (original)
+++ packages/cooker/nucleo/current/SPECS/nucleo.spec Fri Feb 9 16:29:55 2007
@@ -7,7 +7,7 @@
%define name nucleo
%define version 0.6
#%define cvs 20061224
-%define rel 2
+%define rel 3
%define release %mkrel %{rel}
%define distname %{name}-%{version}
@@ -29,6 +29,11 @@
Patch1: nucleo-0.6-fixdnssd.patch
# (fc) 0.6-2mdv fix debug in 32bit
Patch2: nucleo-0.6-32bit.patch
+# (fc) 0.6-3mdv fix plugins names (CVS)
+Patch3: nucleo-0.6-fixplugins.patch
+# (fc) 0.6-3mdv fix DNS-SD support with avahi
+Patch4: nucleo-0.6-avahi.patch
+
License: LGPL
Group: System/Libraries
Url: http://www.lri.fr/~roussel/projects/nucleo/
@@ -37,6 +42,8 @@
BuildRequires: mesaglu-devel jpeg-devel png-devel libexif-devel freetype2-devel
BuildRequires: ffmpeg-devel
BuildRequires: libxi-devel
+BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: qt4-devel
ExclusiveArch: %ix86 x86_64
@@ -53,6 +60,20 @@
This package contains the library needed to run programs dynamically
linked with %{name}.
+%package -n %{lib_name}-plugins-ffmpeg
+Summary: FFMpeg plugin for nucleo
+Group: System/Libraries
+
+%description -n %{lib_name}-plugins-ffmpeg
+This package contains FFMPEG plugin for nucleo.
+
+%package -n %{lib_name}-plugins-qt
+Summary: QT4 plugin for nucleo
+Group: System/Libraries
+
+%description -n %{lib_name}-plugins-qt
+This package contains QT4 plugin for nucleo.
+
%package -n %{lib_name}-devel
Summary: Development tools for programs using %{name}
Group: Development/C
@@ -70,17 +91,26 @@
%patch0 -p1 -b .64bit-fixes
%patch1 -p1 -b .fixdnssd
%patch2 -p1 -b .32bit
+%patch3 -p1 -b .fixplugins
+%patch4 -p1 -b .avahi
-#needed by patch1
+#needed by patches 1, 3 & 4
+aclocal-1.9
automake-1.9
+#needed by patch4
+autoconf
+
%build
-%configure2_5x --disable-qt
+%configure2_5x
%make
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall_std
+
+#remove unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/nucleo/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -107,17 +137,20 @@
%defattr(-,root,root)
%{_libdir}/libNucleo.so.*
%{_libdir}/libNucleo.la
-%{_libdir}/libnPffmpeg.so.*
-%{_libdir}/libnPffmpeg.la
+
+%files -n %{lib_name}-plugins-ffmpeg
+%defattr(-,root,root)
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/nPffmpeg.so
+
+%files -n %{lib_name}-plugins-qt
+%defattr(-,root,root)
%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/nPffmpeg.so.*
-%{_libdir}/%{name}/nPffmpeg.la
+%{_libdir}/%{name}/nPqt.so
%files -n %{lib_name}-devel
%defattr(-,root,root)
%{_libdir}/libNucleo.so
-%{_libdir}/libnPffmpeg.so
-%{_libdir}/%{name}/nPffmpeg.so
%{_libdir}/pkgconfig/%{name}.pc
%{_bindir}/nucleo-config
%dir %{_includedir}/%{name}
