commit libpt2 for openSUSE:Factory
Hello community, here is the log from the commit of package libpt2 for openSUSE:Factory checked in at Fri Oct 15 16:52:28 CEST 2010. -------- --- libpt2/libpt2.changes 2010-10-04 13:07:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpt2/libpt2.changes 2010-10-14 10:26:58.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Oct 14 10:25:41 CEST 2010 - vuntz@opensuse.org + +- Disable the build of the avc plugin, like we did for the dc + plugin: it doesn't work with the new libraw1394. We have a + %build_avc define to easily switch this back, and when the build + %is disabled, we make libpt%{_version} obsolete the plugin + %subpackage, to make sure it gets removed from install. + +------------------------------------------------------------------- +Thu Oct 7 01:08:54 UTC 2010 - reddwarf@opensuse.org + +- Add libpt2-2.6.7-missing_links.patch + + Fixes build with -Wl,--no-undefined + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libpt2-2.6.7-missing_links.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpt2.spec ++++++ --- /var/tmp/diff_new_pack.S3IMN3/_old 2010-10-15 16:49:18.000000000 +0200 +++ /var/tmp/diff_new_pack.S3IMN3/_new 2010-10-15 16:49:18.000000000 +0200 @@ -16,12 +16,13 @@ # +%define build_avc 0 %define build_dc 0 Name: libpt2 %define _name ptlib Version: 2.6.7 -Release: 2 +Release: 3 # FIXME: when upgrading, check if the dc plugin builds with the current version of libdc1394 %define _version 2_6_7 License: MPLv1.0 @@ -32,12 +33,16 @@ Source: %{_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM %{_name}-pkg_config.patch sf#3041093 reddwarf@opensuse.org -- Put extra libraries in Libs.private and remove unneeded cflags Patch0: %{_name}-pkg_config.patch +# PATCH-FIX-UPSTREAM %{_name}-missing_links.patch sf#3082616 reddwarf@opensuse.org -- Link plugins against main library +Patch1: %{name}-2.6.7-missing_links.patch BuildRequires: SDL-devel BuildRequires: bison BuildRequires: esound-devel BuildRequires: flex BuildRequires: gcc-c++ +%if %{build_avc} BuildRequires: libavc1394-devel +%endif %if %{build_dc} BuildRequires: libdc1394-devel %endif @@ -56,13 +61,15 @@ %package -n libpt%{_version} - License: MPLv1.0 Summary: Portable Windows Library from Equivalence Pty. Ltd. version 2 Group: System/Libraries # This used to be a subpackage Provides: libpt2-plugins-v4l2 = %{version} Obsoletes: libpt2-plugins-v4l2 < %{version} +%if ! %{build_avc} +Obsoletes: libpt%{_version}-plugins-avc <= %{version} +%endif %if ! %{build_dc} Obsoletes: libpt%{_version}-plugins-dc <= %{version} %endif @@ -88,7 +95,6 @@ %package -n libpt%{_version}-plugins-esd - License: MPLv1.0 Summary: ESD plugin for %{name} Group: System/Libraries @@ -100,8 +106,9 @@ %description -n libpt%{_version}-plugins-esd This plugin enables ESD (Enlightened Sound Daemon) support in %{name}. -%package -n libpt%{_version}-plugins-avc +%if %{build_avc} +%package -n libpt%{_version}-plugins-avc License: MPLv1.0 Summary: AVC plugin for %{name} @@ -115,12 +122,12 @@ %description -n libpt%{_version}-plugins-avc This plugin enables AVC (firewire control for digital video cameras) support in %{name}. +%endif %if %{build_dc} %package -n libpt%{_version}-plugins-dc - License: MPLv1.0 Summary: DC plugin for %{name} Group: System/Libraries @@ -137,7 +144,6 @@ %package -n libpt%{_version}-plugins-v4l - License: MPLv1.0 Summary: V4L support for %{name} Group: System/Libraries @@ -151,6 +157,7 @@ %prep %setup -q -n %{_name}-%{version} %patch0 +%patch1 %build %configure \ @@ -158,7 +165,7 @@ --enable-oss \ --enable-v4l \ --enable-avc -make %{?jobs:-j %jobs} V=1 +make %{?_smp_mflags} V=1 %install %makeinstall @@ -199,9 +206,12 @@ %defattr(-,root,root) %{_libdir}/%{_name}-%{version}/devices/sound/esd_pwplugin.so +%if %{build_avc} + %files -n libpt%{_version}-plugins-avc %defattr(-,root,root) %{_libdir}/%{_name}-%{version}/devices/videoinput/avc_pwplugin.so +%endif %if %{build_dc} ++++++ libpt2-2.6.7-missing_links.patch ++++++ Index: make/plugins.mak =================================================================== --- make/plugins.mak.orig +++ make/plugins.mak @@ -60,7 +60,7 @@ $(OBJDIR)/$(PLUGIN_FILENAME): $(PLUGIN_S @mkdir -p $(OBJDIR) $(Q_CC)$(CXX) $(STDCCFLAGS) $(CFLAGS) \ $(LDSOPTS) $< \ - $(PLUGIN_LIBS) \ + $(PLUGIN_LIBS) $(PTLIBDIR)/lib_$(PLATFORM_TYPE)/libpt.so \ $(LDFLAGS) \ -o $@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de