add pkgconfig support
This commit is contained in:
Dan Horák
parent
0e6c04f216
commit
e8a5ddf1ae
91
cdparanoia-10.2-add-pkgconfig.patch
Normal file
91
cdparanoia-10.2-add-pkgconfig.patch
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
From 5beb3983942ce92ea18a2a0f2e15f84fb25c27d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: xiphmont <xiphmont@0101bb08-14d6-0310-b084-bc0e0c8e3800>
|
||||||
|
Date: Fri, 11 Jun 2010 15:42:00 +0000
|
||||||
|
Subject: [PATCH] Add pkgconfig file to cdparanoia; closes Trac #1706
|
||||||
|
|
||||||
|
git-svn-id: https://svn.xiph.org/trunk/cdparanoia@17289 0101bb08-14d6-0310-b084-bc0e0c8e3800
|
||||||
|
---
|
||||||
|
Makefile.in | 7 +++++--
|
||||||
|
cdparanoia-3.pc.in | 12 ++++++++++++
|
||||||
|
configure.in | 5 ++++-
|
||||||
|
3 files changed, 21 insertions(+), 3 deletions(-)
|
||||||
|
create mode 100644 cdparanoia-3.pc.in
|
||||||
|
|
||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index 25c91ce..bfef153 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
# DO NOT EDIT BELOW! ##########################################################
|
||||||
|
# (unless, of course, you know what you are doing :) ##########################
|
||||||
|
|
||||||
|
-VERSION=10.2
|
||||||
|
+VERSION=@VERSION@
|
||||||
|
VPATH=@srcdir@
|
||||||
|
srcdir=@srcdir@
|
||||||
|
|
||||||
|
@@ -23,6 +23,7 @@ BINDIR=@bindir@
|
||||||
|
MANDIR=@mandir@
|
||||||
|
INCLUDEDIR=@includedir@
|
||||||
|
LIBDIR=@libdir@
|
||||||
|
+PKGCONFIGDIR=@libdir@/pkgconfig
|
||||||
|
PWD = $(shell pwd)
|
||||||
|
|
||||||
|
OFILES = main.o report.o header.o buffering_write.o cachetest.o
|
||||||
|
@@ -85,6 +86,8 @@ install:
|
||||||
|
$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
|
||||||
|
ln -fs libcdda_paranoia.so.0.$(VERSION) \
|
||||||
|
$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
|
||||||
|
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PKGCONFIGDIR)
|
||||||
|
+ $(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(DESTDIR)$(PKGCONFIGDIR)
|
||||||
|
|
||||||
|
cdparanoia: $(OFILES) $(LIBDEP)
|
||||||
|
$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
|
||||||
|
@@ -104,6 +107,6 @@ distclean:
|
||||||
|
cd interface && $(MAKE) distclean
|
||||||
|
cd paranoia && $(MAKE) distclean
|
||||||
|
-rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \
|
||||||
|
- Makefile verify_test core gmon.out
|
||||||
|
+ Makefile verify_test core gmon.out cdparanoia-3.pc
|
||||||
|
|
||||||
|
.PHONY: all debug test lib slib install clean distclean
|
||||||
|
diff --git a/cdparanoia-3.pc.in b/cdparanoia-3.pc.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..3a15099
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/cdparanoia-3.pc.in
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
+libdir=@libdir@
|
||||||
|
+includedir=@includedir@
|
||||||
|
+
|
||||||
|
+Name: Cdparanoia III
|
||||||
|
+Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library
|
||||||
|
+Requires:
|
||||||
|
+Version: @VERSION@
|
||||||
|
+Libs: -L${libdir} -lcdda_interface -lcdda_paranoia
|
||||||
|
+Cflags: -I${includedir}
|
||||||
|
+
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 3ad98ca..3ae6989 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -1,5 +1,8 @@
|
||||||
|
AC_INIT(interface/interface.c)
|
||||||
|
|
||||||
|
+VERSION="10.2"
|
||||||
|
+AC_SUBST(VERSION)
|
||||||
|
+
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
if test -z "$CC"; then
|
||||||
|
@@ -67,4 +70,4 @@ AC_SUBST(OPT)
|
||||||
|
AC_SUBST(DEBUG)
|
||||||
|
AC_SUBST(CC)
|
||||||
|
|
||||||
|
-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
|
||||||
|
+AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc)
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: Compact Disc Digital Audio (CDDA) extraction tool (or ripper)
|
Summary: Compact Disc Digital Audio (CDDA) extraction tool (or ripper)
|
||||||
Name: cdparanoia
|
Name: cdparanoia
|
||||||
Version: 10.2
|
Version: 10.2
|
||||||
Release: 34%{?dist}
|
Release: 35%{?dist}
|
||||||
# the app is GPLv2, everything else is LGPLv2
|
# the app is GPLv2, everything else is LGPLv2
|
||||||
License: GPLv2 and LGPLv2
|
License: GPLv2 and LGPLv2
|
||||||
URL: http://www.xiph.org/paranoia/index.html
|
URL: http://www.xiph.org/paranoia/index.html
|
||||||
@ -17,6 +17,8 @@ Patch2: cdparanoia-10.2-install.patch
|
|||||||
Patch3: cdparanoia-10.2-format-security.patch
|
Patch3: cdparanoia-10.2-format-security.patch
|
||||||
Patch4: cdparanoia-use-proper-gnu-config-files.patch
|
Patch4: cdparanoia-use-proper-gnu-config-files.patch
|
||||||
Patch5: cdparanoia-10.2-ldflags.patch
|
Patch5: cdparanoia-10.2-ldflags.patch
|
||||||
|
# https://svn.xiph.org/trunk/cdparanoia@17289
|
||||||
|
Patch6: cdparanoia-10.2-add-pkgconfig.patch
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
@ -68,6 +70,7 @@ for developing applications to read CD Digital Audio disks.
|
|||||||
%patch3 -p1 -b .fmt-sec
|
%patch3 -p1 -b .fmt-sec
|
||||||
%patch4 -p1 -b .config
|
%patch4 -p1 -b .config
|
||||||
%patch5 -p1 -b .ldflags
|
%patch5 -p1 -b .ldflags
|
||||||
|
%patch6 -p1 -b .pkgconfig
|
||||||
|
|
||||||
# Update config.guess/sub for newer architectures
|
# Update config.guess/sub for newer architectures
|
||||||
cp /usr/lib/rpm/redhat/config.* .
|
cp /usr/lib/rpm/redhat/config.* .
|
||||||
@ -95,12 +98,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/cdda/
|
%{_includedir}/cdda/
|
||||||
|
%{_libdir}/pkgconfig/*.pc
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
|
|
||||||
%files static
|
%files static
|
||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 26 2020 Dan Horák <dan[at]danny.cz> - 10.2-35
|
||||||
|
- Add pkgconfig support
|
||||||
|
|
||||||
* Mon Oct 05 2020 Stephen Gallagher <sgallagh@redhat.com> - 10.2-34
|
* Mon Oct 05 2020 Stephen Gallagher <sgallagh@redhat.com> - 10.2-34
|
||||||
- Fix build on Fedora 33+
|
- Fix build on Fedora 33+
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user