pool/libdc1394
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 80001 from home:namtrac:bugfix

Browse Source 
- Add libdc1394-visibility.patch to properly hide internal symbols
  to prevent potential clashes with other libraries, sf #3361405 ,
  bko # 268267

OBS-URL: https://build.opensuse.org/request/show/80001
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdc1394?expand=0&rev=17
This commit is contained in:
Stephan Kulow 2011-08-29 11:39:34 +00:00 committed by Git OBS Bridge
parent 51d4ab705e
commit 4784c2a548
3 changed files with 2796 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2756
libdc1394-visibility.patch Normal file
View File

File diff suppressed because it is too large Load Diff

7
libdc1394.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 29 08:03:27 UTC 2011 - idonmez@suse.com
- Add libdc1394-visibility.patch to properly hide internal symbols
to prevent potential clashes with other libraries, sf #3361405 ,
bko # 268267
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 7 09:47:56 UTC 2011 - idonmez@novell.com Thu Jul 7 09:47:56 UTC 2011 - idonmez@novell.com

127
libdc1394.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
# if Build_12 is equal to 0 don't build version 1.2.2 # if Build_12 is equal to 0 don't build version 1.2.2
%define Build_12 0 %define Build_12 0
@ -26,19 +25,18 @@ Name: libdc1394
BuildRequires: libraw1394-devel BuildRequires: libraw1394-devel
%if 0%{?suse_version} > 1100 %if 0%{?suse_version} > 1100
# no IIDC-over-USB support for openSUSE 11.0 # no IIDC-over-USB support for openSUSE 11.0
BuildRequires: libusb-1_0-devel pkg-config BuildRequires: libusb-1_0-devel
BuildRequires: pkg-config
%endif %endif
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4 BuildRequires: libv4l-devel >= 0.8.4
%endif %endif
License: LGPLv2.1+
Group: Hardware/Camera
AutoReqProv: on
Version: %{libdc1394_version} Version: %{libdc1394_version}
Release: 25 Release: 25
Url: http://sourceforge.net/projects/libdc1394/ License: LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Url: http://sourceforge.net/projects/libdc1394/
Group: Hardware/Camera
Source1: libdc1394-%{libdc1394_12_version}.tar.bz2 Source1: libdc1394-%{libdc1394_12_version}.tar.bz2
Source2: libdc1394-%{libdc1394_version}.tar.bz2 Source2: libdc1394-%{libdc1394_version}.tar.bz2
Source3: %{name}-rpmlintrc Source3: %{name}-rpmlintrc
@ -47,6 +45,8 @@ Patch1: libdc1394.ac.patch
Patch2: libdc1394-swab_fix.patch Patch2: libdc1394-swab_fix.patch
Patch3: libdc1394.raw1394_set_iso_handler.patch Patch3: libdc1394.raw1394_set_iso_handler.patch
Patch4: libdc1394-v4l-2.6.38.patch Patch4: libdc1394-v4l-2.6.38.patch
Patch5: libdc1394-visibility.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
@ -54,75 +54,38 @@ conforms to the 1394-Based Digital Camera Specification. It utilizes
the low-level functionality provided by libraw1394 to communicate with the low-level functionality provided by libraw1394 to communicate with
the camera. the camera.
Authors:
--------
Gord Peters <GordPeters@smarttech.com>
Per Dalgas Jakobsen <pdj@maridan.dk>
Chris Urmson <curmson@ri.cmu.edu>
Damien Douxchamps <douxchamps@ieee.org>
Dan Dennedy <dan@dennedy.org>
David Moore <david@startbox.com>
John Stanley <stanley@peak.org>
%if %{Build_12} >= 1 %if %{Build_12} >= 1
%package -n libdc1394_control12 %package -n libdc1394_control12
Version: %{libdc1394_12_version}
Release: 21
License: LGPLv2.1+ License: LGPLv2.1+
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera Group: Hardware/Camera
Version: %{libdc1394_12_version}
Release: 21
%description -n libdc1394_control12 %description -n libdc1394_control12
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be conforms to the 1394-Based Digital Camera Specification (which can be
found at found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf) It utilizes the low-level functionality provided by libraw1394 to
. It utilizes the low-level functionality provided by libraw1394 to
communicate with the camera. communicate with the camera.
Authors:
--------
Gord Peters <GordPeters@smarttech.com>
Per Dalgas Jakobsen <pdj@maridan.dk>
Chris Urmson <curmson@ri.cmu.edu>
Damien Douxchamps <douxchamps@ieee.org>
Dan Dennedy <dan@dennedy.org>
David Moore <david@startbox.com>
John Stanley <stanley@peak.org>
%package -n libdc1394_control12-devel %package -n libdc1394_control12-devel
Version: %{libdc1394_12_version}
Release: 21
License: LGPLv2.1+ License: LGPLv2.1+
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Version: %{libdc1394_12_version} Requires: libdc1394_control12 = %{libdc1394_12_version}
Release: 21 Requires: libraw1394-devel
Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel
%description -n libdc1394_control12-devel %description -n libdc1394_control12-devel
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be conforms to the 1394-Based Digital Camera Specification (which can be
found at found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf) It utilizes the low-level functionality provided by libraw1394 to
. It utilizes the low-level functionality provided by libraw1394 to
communicate with the camera. communicate with the camera.
Authors:
--------
Gord Peters <GordPeters@smarttech.com>
Per Dalgas Jakobsen <pdj@maridan.dk>
Chris Urmson <curmson@ri.cmu.edu>
Damien Douxchamps <douxchamps@ieee.org>
Dan Dennedy <dan@dennedy.org>
David Moore <david@startbox.com>
John Stanley <stanley@peak.org>
%endif %endif
%package 22 %package 22
@ -133,47 +96,22 @@ Group: Hardware/Camera
%description 22 %description 22
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
conforms to the 1394-Based Digital Camera Specification (which can be conforms to the 1394-Based Digital Camera Specification (which can be
found at found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf).
http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf) It utilizes the low-level functionality provided by libraw1394 to
. It utilizes the low-level functionality provided by libraw1394 to
communicate with the camera. communicate with the camera.
Authors:
--------
Gord Peters <GordPeters@smarttech.com>
Per Dalgas Jakobsen <pdj@maridan.dk>
Chris Urmson <curmson@ri.cmu.edu>
Damien Douxchamps <douxchamps@ieee.org>
Dan Dennedy <dan@dennedy.org>
David Moore <david@startbox.com>
John Stanley <stanley@peak.org>
%package devel %package devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Development libraries and header files for dc1394 Summary: Development libraries and header files for dc1394
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libdc1394-22 = %{libdc1394_version}
Requires: libdc1394 = %{libdc1394_version} Requires: libdc1394 = %{libdc1394_version}
Requires: libdc1394-22 = %{libdc1394_version}
Requires: libraw1394-devel Requires: libraw1394-devel
%description devel %description devel
This package contains the header files and libraries for building This package contains the header files and libraries for building
programs using the dc1394 library. programs using the dc1394 library.
Authors:
--------
Gord Peters <GordPeters@smarttech.com>
Per Dalgas Jakobsen <pdj@maridan.dk>
Chris Urmson <curmson@ri.cmu.edu>
Damien Douxchamps <douxchamps@ieee.org>
Dan Dennedy <dan@dennedy.org>
David Moore <david@startbox.com>
John Stanley <stanley@peak.org>
%prep %prep
%setup -q -T -c -a 1 -a 2 %setup -q -T -c -a 1 -a 2
%patch0 -p1 %patch0 -p1
@ -183,14 +121,15 @@ Authors:
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%patch4 %patch4
%endif %endif
%patch5
%build %build
doit() { doit() {
if pushd "$1" ; then if pushd "$1" ; then
autoreconf --force --install autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="%{optflags}"
%{configure} --disable-static --with-pic --disable-xv %{configure} --disable-static --with-pic --disable-xv
%{__make} %{?jobs:-j%jobs} make %{?_smp_mflags}
popd popd
fi fi
} }
@ -202,7 +141,7 @@ doit libdc1394-%{libdc1394_version}
%install %install
doit() { doit() {
if pushd "$1" ; then if pushd "$1" ; then
%{__make} DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=%{buildroot} install
popd popd
fi fi
} }
@ -213,7 +152,7 @@ doit libdc1394-%{libdc1394_version}
rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1* rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1*
rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1*
rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1*
%{__rm} -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
%if %{Build_12} >= 1 %if %{Build_12} >= 1
@ -229,29 +168,29 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1*
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README} %doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%_bindir/dc1394_reset_bus %{_bindir}/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1* %{_mandir}/man1/dc1394_reset_bus.1*
%files 22 %files 22
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libdc1394.so.22* %{_libdir}/libdc1394.so.22*
%if %{Build_12} >= 1 %if %{Build_12} >= 1
%files -n libdc1394_control12 %files -n libdc1394_control12
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libdc1394_control.so.* %{_libdir}/libdc1394_control.so.*
%files -n libdc1394_control12-devel %files -n libdc1394_control12-devel
%defattr(-,root,root) %defattr(-,root,root)
%_includedir/libdc1394 %{_includedir}/libdc1394
%_libdir/libdc1394_control*.so %{_libdir}/libdc1394_control*.so
%endif %endif
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%_includedir/dc1394 %{_includedir}/dc1394
%_libdir/libdc1394.so %{_libdir}/libdc1394.so
%_libdir/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog