Add dso-linking patch to fix FTBFS due to new linking behavior.

epel9
Jay Fenlason 15 years ago
parent e4dca71bc1
commit 0efea495ab

@ -0,0 +1,12 @@
We now need to explicitly link to libraries that we use because we can no
longer depend on our dependencies to pull them in for us. See
http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
--- libdv-1.0.0/playdv/#Makefile.am~ 2010-02-15 14:49:06.000000000 -0500
+++ libdv-1.0.0/playdv/Makefile.am 2010-02-15 14:49:06.000000000 -0500
@@ -15,4 +15,4 @@ bin_PROGRAMS= playdv
noinst_HEADERS= display.h oss.h
playdv_SOURCES= playdv.c display.c display.h oss.c
-playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
+playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext

@ -1,7 +1,7 @@
Summary: Software decoder for DV format video
Name: libdv
Version: 1.0.0
Release: 8%{?dist}
Release: 9%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libdv.sourceforge.net/
@ -9,6 +9,7 @@ Source: http://downloads.sourceforge.net/libdv/libdv-%{version}.tar.gz
Patch1: libdv-0.104-no-exec-stack.patch
Patch2: libdv-1.0.0-pic.patch
Patch3: libdv-1.0.0-gtk2.patch
Patch4: libdv-1.0.0-dso-linking.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: gtk2-devel
BuildRequires: libXt-devel, libXv-devel
@ -52,6 +53,7 @@ This package contains development files for libdv.
%patch1 -p0 -b .no-exec-stack
%patch2 -p1 -b .pic
%patch3 -p1 -b .gtk2
%patch4 -p1 -b .dso-linking
# Required for libtool 2.2
libtoolize
# Required for the gtk2 patch
@ -98,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libdv.pc
%changelog
* Mon Feb 15 2010 Jay Fenlason <fenlason@redhat.com> 1.0.0-9
- Add dso-linking patch to explicitly pull in the X libraries that
playdv depends on.
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

Loading…
Cancel
Save