[pve-devel] [PATCH pve-libspice-server v2 2/6] replace CELT with libopus

[Dominik Csapak]

this is now the default upstream and one small library as additional
dependency

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
changes since v1:
* removed the dh_auto_install override
 Makefile                               | 7 -------
 debian/control                         | 1 +
 debian/pve-libspice-server-dev.install | 1 -
 debian/rules                           | 6 +-----
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index aa942b8..3a8a737 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,6 @@ DEB=pve-libspice-server1_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb
 DEB_DBG=pve-libspice-server-dev_${PKGVERSION}-${PKGRELEASE}_${ARCH}.deb
 DEBS=$(DEB) $(DEB_DBG)
 
-CELTDIR=celt-0.5.1.3
-CELTSRC=${CELTDIR}.tar.gz
-
 all: ${DEBS}
 	echo ${DEBS}
 
@@ -27,10 +24,6 @@ $(DEB): ${PKGSRC}
 	echo ${DEBS}
 	rm -rf ${PKGDIR}
 	tar xf ${PKGSRC}
-	# compile CELT first
-	tar xf ${CELTSRC} -C ${PKGDIR}
-	cd ${PKGDIR}; ln -s ${CELTDIR}/libcelt celt051
-	cd ${PKGDIR}/${CELTDIR}; ./configure --prefix=/usr; make
 	# now compile spice server
 	cp -a debian ${PKGDIR}/debian
 	echo "git clone git://git.proxmox.com/git/pve-libspice-server.git\\ngit checkout ${GITVERSION}" > ${PKGDIR}/debian/SOURCE
diff --git a/debian/control b/debian/control
index 783f678..d1cbf2d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends: autotools-dev,
                libglib2.0-dev,
                libjpeg-dev,
                libogg-dev,
+               libopus-dev,
                libpixman-1-dev (>= 0.17.7~),
                libsasl2-dev,
                libssl-dev,
diff --git a/debian/pve-libspice-server-dev.install b/debian/pve-libspice-server-dev.install
index 6cd8ddd..5774e64 100644
--- a/debian/pve-libspice-server-dev.install
+++ b/debian/pve-libspice-server-dev.install
@@ -1,4 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index 4d95b45..0d9bea3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,7 @@
 #export DH_VERBOSE=1
 
 override_dh_auto_configure:
-	CELT051_CFLAGS="-I$(CURDIR)"  CELT051_LIBS="-L$(CURDIR)/celt051/.libs -lcelt051 -lm" ./configure --prefix=/usr --with-sasl --disable-smartcard --enable-celt051
+	./configure --prefix=/usr --with-sasl --disable-smartcard --disable-celt051
 
 %:
 	dh $@  -with quilt --with autotools-dev
-
-override_dh_auto_install:
-	$(MAKE) -C celt-0.5.1.3 install DESTDIR=$(CURDIR)/debian/tmp
-	dh_auto_install
-- 
2.11.0