tags 622075 + patch tags 622075 + pending thanks Dear maintainer,
I've prepared an NMU for pwlib (versioned as 1.10.10-3.1) and uploaded it to DELAYED/2. You'll find the diff attached. Cheers, Julien
diff -u pwlib-1.10.10/debian/control pwlib-1.10.10/debian/control --- pwlib-1.10.10/debian/control +++ pwlib-1.10.10/debian/control @@ -17,7 +17,7 @@ Package: libpt-1.10.10 Section: libs Architecture: any -Depends: ${shlibs:Depends}, libpt-1.10.10-plugins-alsa|libpt-1.10.10-plugins-oss, libpt-1.10.10-plugins-v4l|libpt-1.10.10-plugins-v4l2 +Depends: ${shlibs:Depends}, libpt-1.10.10-plugins-alsa|libpt-1.10.10-plugins-oss, libpt-1.10.10-plugins-v4l2 Conflicts: libpt-1.10.10-ptrace, libpt-1.10.10-develop Description: Portable Windows Library This package contains the shared version of the library PWLib, which is @@ -60,18 +60,6 @@ many years ago as a method to produce applications to run on both Microsoft Windows and Unix X-Window systems. -Package: libpt-1.10.10-plugins-v4l -Section: libs -Architecture: any -Depends: ${shlibs:Depends} -Conflicts: libpt-plugins-v4l -Replaces: libpt-plugins-v4l -Provides: libpt-plugins-v4l -Description: Portable Windows Library Video Plugin for Video4Linux - This package contains the PWLib plugin for usage with Video4Linux - devices. Install this package, if you want to use a video device - that is not attached to FireWire. - Package: libpt-1.10.10-plugins-v4l2 Section: libs Architecture: any diff -u pwlib-1.10.10/debian/changelog pwlib-1.10.10/debian/changelog --- pwlib-1.10.10/debian/changelog +++ pwlib-1.10.10/debian/changelog @@ -1,3 +1,11 @@ +pwlib (1.10.10-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with openssl 1.0 (closes: #622075). + * Drop v4l plugin, v4l1 is dead. + + -- Julien Cristau <jcris...@debian.org> Fri, 01 Jul 2011 23:22:15 +0200 + pwlib (1.10.10-3) unstable; urgency=low [ Victor Seva ] diff -u pwlib-1.10.10/debian/rules pwlib-1.10.10/debian/rules --- pwlib-1.10.10/debian/rules +++ pwlib-1.10.10/debian/rules @@ -50,7 +50,7 @@ build-arch: config.status build-arch-stamp config.status: patch-stamp autotools configure - ./configure $(confflags) --enable-plugins --enable-v4l2 --enable-oss --enable-v4l --disable-avc --disable-dc --prefix=/usr + ./configure $(confflags) --enable-plugins --enable-v4l2 --enable-oss --disable-v4l --disable-avc --disable-dc --prefix=/usr autotools: rm -f config.sub config.guess @@ -206,11 +206,6 @@ # plugins - #$(PACKAGE)-plugins-v4l - install -d -m 755 debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/ - cp plugins/pwlib/device/videoinput/v4l_pwplugin.so \ - debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/ - #$(PACKAGE)-plugins-v4l2 install -d -m 755 debian/$(PACKAGE)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/ cp plugins/pwlib/device/videoinput/v4l2_pwplugin.so \ @@ -267,7 +262,7 @@ dh_strip --exclude=libpt_d --keep-debug for pack in $(PACKAGE) $(PACKAGE)-plugins-alsa $(PACKAGE)-plugins-oss \ - $(PACKAGE)-plugins-v4l $(PACKAGE)-plugins-v4l2 $(PACKAGE)-plugins-avc \ + $(PACKAGE)-plugins-v4l2 $(PACKAGE)-plugins-avc \ $(PACKAGE)-plugins-dc ; \ do \ cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \ only in patch2: unchanged: --- pwlib-1.10.10.orig/plugins/vidinput_v4l2/vidinput_v4l2.h +++ pwlib-1.10.10/plugins/vidinput_v4l2/vidinput_v4l2.h @@ -80,7 +80,7 @@ #ifdef SOLARIS #include <sys/videodev2.h> #else -#include <linux/videodev.h> +#include <linux/videodev2.h> #endif #ifndef V4L2_PIX_FMT_SBGGR8 only in patch2: unchanged: --- pwlib-1.10.10.orig/plugins/vidinput_dc/Makefile +++ pwlib-1.10.10/plugins/vidinput_dc/Makefile @@ -0,0 +1,12 @@ +ifndef PWLIBDIR +PWLIBDIR = $(HOME)/pwlib +endif + +PLUGIN_NAME = dc +PLUGIN_FAMILY = device/videoinput +PLUGIN_LIBS = -lraw1394 -ldv -ldc1394_control +PLUGIN_SOURCES = video4dc1394.cxx + +CFLAGS = + +include ../../make/plugins.mak only in patch2: unchanged: --- pwlib-1.10.10.orig/debian/libpt-1.10.10-dbg.dirs +++ pwlib-1.10.10/debian/libpt-1.10.10-dbg.dirs @@ -0,0 +1 @@ +usr/lib/debug/usr/lib only in patch2: unchanged: --- pwlib-1.10.10.orig/src/ptclib/pssl.cxx +++ pwlib-1.10.10/src/ptclib/pssl.cxx @@ -888,7 +888,7 @@ InitialisationMutex.Signal(); // create the new SSL context - SSL_METHOD * meth = SSLv23_method(); + const SSL_METHOD * meth = SSLv23_method(); context = SSL_CTX_new(meth); if (context == NULL) PSSLAssert("Error creating context: ");
signature.asc
Description: Digital signature