rpms
/
libavc1394
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix duplicate global symbols in libavc1394 vs. librom1394 (#216143)

Browse Source
epel9
Jarod Wilson 16 years ago
parent 06f6ef42a1
commit 548827501b
3 changed files with 93 additions and 41 deletions
Show Stats Download Patch File Download Diff File

39
libavc1394-0.5.1-librom.patch
Unescape View File

@ -1,39 +0,0 @@
diff -Naupr libavc1394-0.5.1.orig/libavc1394/Makefile.am libavc1394-0.5.1/libavc1394/Makefile.am
--- libavc1394-0.5.1.orig/libavc1394/Makefile.am 2005-02-17 13:57:48.000000000 +0100
+++ libavc1394-0.5.1/libavc1394/Makefile.am 2005-11-10 18:59:52.000000000 +0100
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = libavc1394.la
libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
- -version-info @lt_major@:@lt_revision@:@lt_age@
-libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
+ -version-info @lt_major@:@lt_revision@:@lt_age@
+libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo $(top_builddir)/librom1394/librom1394.la
libavc1394_la_SOURCES = \
avc1394_simple.c avc1394_vcr.c \
- avc1394_internal.c avc1394_internal.h
+ avc1394_internal.c avc1394_internal.h
pkginclude_HEADERS = avc1394.h avc1394_vcr.h
INCLUDES = @LIBRAW1394_CFLAGS@
diff -Naupr libavc1394-0.5.1.orig/librom1394/Makefile.am libavc1394-0.5.1/librom1394/Makefile.am
--- libavc1394-0.5.1.orig/librom1394/Makefile.am 2005-02-17 13:57:56.000000000 +0100
+++ libavc1394-0.5.1/librom1394/Makefile.am 2005-11-10 18:59:43.000000000 +0100
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = librom1394.la
librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
- -version-info @lt_major@:@lt_revision@:@lt_age@ -lm
+ -version-info @lt_major@:@lt_revision@:@lt_age@ -lm -lraw1394
librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
librom1394_la_SOURCES = \
rom1394_main.c \
diff -Naupr libavc1394-0.5.1.orig/Makefile.am libavc1394-0.5.1/Makefile.am
--- libavc1394-0.5.1.orig/Makefile.am 2005-02-17 15:11:06.000000000 +0100
+++ libavc1394-0.5.1/Makefile.am 2005-11-10 18:58:44.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = common libavc1394 librom1394 test
+SUBDIRS = common librom1394 libavc1394 test
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
stamp-h.in
EXTRA_DIST = libavc1394.pc libavc1394.spec

88
libavc1394-0.5.3-librom.patch
Unescape View File

@ -0,0 +1,88 @@
Index: libavc1394-0.5.3/Makefile.am
===================================================================
--- libavc1394-0.5.3.orig/Makefile.am
+++ libavc1394-0.5.3/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common libavc1394 librom1394 test
+SUBDIRS = common librom1394 libavc1394 test
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
stamp-h.in
EXTRA_DIST = libavc1394.pc libavc1394.spec
Index: libavc1394-0.5.3/Makefile.in
===================================================================
--- libavc1394-0.5.3.orig/Makefile.in
+++ libavc1394-0.5.3/Makefile.in
@@ -189,7 +189,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = common libavc1394 librom1394 test
+SUBDIRS = common librom1394 libavc1394 test
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
stamp-h.in
Index: libavc1394-0.5.3/libavc1394/Makefile.am
===================================================================
--- libavc1394-0.5.3.orig/libavc1394/Makefile.am
+++ libavc1394-0.5.3/libavc1394/Makefile.am
@@ -1,11 +1,11 @@
MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = libavc1394.la
libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
- -version-info @lt_major@:@lt_revision@:@lt_age@
-libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
+ -version-info @lt_major@:@lt_revision@:@lt_age@
+#libavc1394_la_LIBADD = $(top_builddir)/librom1394/librom1394.la
libavc1394_la_SOURCES = \
avc1394_simple.c avc1394_vcr.c \
- avc1394_internal.c avc1394_internal.h
+ avc1394_internal.c avc1394_internal.h
pkginclude_HEADERS = avc1394.h avc1394_vcr.h
INCLUDES = @LIBRAW1394_CFLAGS@
Index: libavc1394-0.5.3/libavc1394/Makefile.in
===================================================================
--- libavc1394-0.5.3.orig/libavc1394/Makefile.in
+++ libavc1394-0.5.3/libavc1394/Makefile.in
@@ -187,12 +187,12 @@ target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = libavc1394.la
libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
- -version-info @lt_major@:@lt_revision@:@lt_age@
+ -version-info @lt_major@:@lt_revision@:@lt_age@
-libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
+libavc1394_la_LIBADD = $(top_builddir)/librom1394/librom1394.la
libavc1394_la_SOURCES = \
avc1394_simple.c avc1394_vcr.c \
- avc1394_internal.c avc1394_internal.h
+ avc1394_internal.c avc1394_internal.h
pkginclude_HEADERS = avc1394.h avc1394_vcr.h
INCLUDES = @LIBRAW1394_CFLAGS@
Index: libavc1394-0.5.3/librom1394/Makefile.am
===================================================================
--- libavc1394-0.5.3.orig/librom1394/Makefile.am
+++ libavc1394-0.5.3/librom1394/Makefile.am
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = librom1394.la
librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
- -version-info @lt_major@:@lt_revision@:@lt_age@ -lm
+ -version-info @lt_major@:@lt_revision@:@lt_age@ -lm -lraw1394
librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
librom1394_la_SOURCES = \
rom1394_main.c \
Index: libavc1394-0.5.3/librom1394/Makefile.in
===================================================================
--- libavc1394-0.5.3.orig/librom1394/Makefile.in
+++ libavc1394-0.5.3/librom1394/Makefile.in
@@ -186,7 +186,7 @@ target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
lib_LTLIBRARIES = librom1394.la
librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
- -version-info @lt_major@:@lt_revision@:@lt_age@ -lm
+ -version-info @lt_major@:@lt_revision@:@lt_age@ -lm -lraw1394
librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
librom1394_la_SOURCES = \

7
libavc1394.spec
Unescape View File

@ -1,12 +1,12 @@
Summary: Audio/Video Control library for IEEE-1394 devices
Name: libavc1394
Version: 0.5.3
Release: 7%{?dist}
Release: 8%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries
URL: http://sourceforge.net/projects/libavc1394/
Source: http://downloads.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
Patch1: libavc1394-0.5.1-librom.patch
Patch1: libavc1394-0.5.3-librom.patch
BuildRequires: libraw1394-devel
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
ExcludeArch: s390 s390x
@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jun 10 2009 Jarod Wilson <jarod@redhat.com> 0.5.3-8
- Fix duplicate global symbols in libavc1394 vs. librom1394 (#216143)
* Mon May 18 2009 Jarod Wilson <jarod@redhat.com> 0.5.3-7
- Use included libtool, kill rpath a different way (#225988)

Write Preview
Loading…
Cancel
Save