Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package crystalhd
This new package release fixes two release critical bugs related to the
buggy driver that was distributed through a dkms package. Users of the driver
should instead use the crystalhd driver already provided in the mainline
kernel. This package also enables the hardening options which is a release
goal. This was missed in the last upload.
Finally, I did end up bumping the Standards-Version from 3.9.3 to 3.9.4.
I can place it back to 3.9.3, though there was no changes needed when
bumping the Standards-Version to 3.9.4.
Below is the debdiff.
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/changelog
crystalhd-0.0~git20110715.fdd2f19/debian/changelog
--- crystalhd-0.0~git20110715.fdd2f19/debian/changelog 2013-03-02
14:23:07.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/changelog 2013-03-02
13:34:42.000000000 -0500
@@ -1,3 +1,15 @@
+crystalhd (1:0.0~git20110715.fdd2f19-8) unstable; urgency=high
+
+ * Remove dkms package which contained buggy driver.
+ Driver already existed in mainline kernel. Any issues with the driver
+ should be directed to the kernel package.
+ (Closes: #682252)
+ (Closes: #699470)
+ * Bump to Standards-Version 3.9.4.
+ * Build with hardening options to satisfy Wheezy release goal.
+
+ -- Andres Mejia <ame...@debian.org> Sat, 02 Mar 2013 13:34:36 -0500
+
crystalhd (1:0.0~git20110715.fdd2f19-7) unstable; urgency=low
* Include udev rules for crystalhd-dkms.
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/control
crystalhd-0.0~git20110715.fdd2f19/debian/control
--- crystalhd-0.0~git20110715.fdd2f19/debian/control 2013-03-02
14:23:07.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/control 2013-03-02
13:01:17.000000000 -0500
@@ -3,9 +3,8 @@
Maintainer: Andres Mejia <ame...@debian.org>
Build-Depends: debhelper (>= 8.1.3~),
libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev,
- dkms
-Standards-Version: 3.9.3
+ libgstreamer-plugins-base0.10-dev
+Standards-Version: 3.9.4
Section: libs
Homepage: http://www.broadcom.com/support/crystal_hd/
Vcs-Git: git://git.debian.org/git/collab-maint/crystalhd.git
@@ -37,18 +36,6 @@
.
This package contains the shared library.
-Package: crystalhd-dkms
-Section: kernel
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, dkms
-Suggests: linux-headers
-Description: Crystal HD Video Decoder (Linux kernel driver)
- Crystal HD Solution is a product offered by Broadcom. It is used to enable
- flawless playback of 1080p high definition video across a wide range of
- systems.
- .
- This package contains the crystalhd Linux kernel driver.
-
Package: gstreamer0.10-crystalhd
Section: video
Architecture: amd64 i386
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.dkms
crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.dkms
--- crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.dkms 2013-03-02
14:23:07.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.dkms 1969-12-31
19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-# DKMS configuration for crystalhd
-
-PACKAGE_NAME="crystalhd"
-PACKAGE_VERSION="#MODULE_VERSION#"
-BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
-BUILT_MODULE_LOCATION[0]=driver/linux
-DEST_MODULE_LOCATION[0]="/updates/dkms/"
-AUTOINSTALL=yes
-
-MAKE[0]="cd driver/linux && ./configure && make"
-CLEAN="make -C driver/linux clean distclean"
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.install
crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.install
--- crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.install 2013-03-02
14:23:07.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/crystalhd-dkms.install 1969-12-31
19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-usr/src
-lib/udev/rules.d
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/patches/hardening-opts.patch
crystalhd-0.0~git20110715.fdd2f19/debian/patches/hardening-opts.patch
--- crystalhd-0.0~git20110715.fdd2f19/debian/patches/hardening-opts.patch
1969-12-31 19:00:00.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/patches/hardening-opts.patch
2013-03-02 13:21:28.000000000 -0500
@@ -0,0 +1,16 @@
+Description: Allow extra compiler and linker flags to be passed into build
+ system.
+Author: Andres Mejia <ame...@debian.org>
+
+--- a/linux_lib/libcrystalhd/Makefile
++++ b/linux_lib/libcrystalhd/Makefile
+@@ -30,6 +30,9 @@
+ CPPFLAGS += $(MACHINE_OPTS)
+ LDFLAGS = -Wl,-soname,${BCLIB_SL} -pthread
+
++CPPFLAGS += $(EXTRA_CPPFLAGS) $(EXTRA_CXXFLAGS)
++LDFLAGS += $(EXTRA_LDFLAGS)
++
+ SRCFILES = libcrystalhd_if.cpp \
+ libcrystalhd_int_if.cpp \
+ libcrystalhd_fwcmds.cpp \
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/patches/series
crystalhd-0.0~git20110715.fdd2f19/debian/patches/series
--- crystalhd-0.0~git20110715.fdd2f19/debian/patches/series 2013-03-02
14:23:07.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/patches/series 2013-03-02
13:08:43.000000000 -0500
@@ -3,3 +3,4 @@
driver-build-failure-fix.patch
gcc-opts-fix.patch
spelling-fix.patch
+hardening-opts.patch
diff -Nru crystalhd-0.0~git20110715.fdd2f19/debian/rules
crystalhd-0.0~git20110715.fdd2f19/debian/rules
--- crystalhd-0.0~git20110715.fdd2f19/debian/rules 2013-03-02
14:23:07.000000000 -0500
+++ crystalhd-0.0~git20110715.fdd2f19/debian/rules 2013-03-02
13:30:22.000000000 -0500
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep -G '^Version' | \
- cut -d ' ' -f 2 | sed 's/^[^:]:*//' | sed 's/-.*$$//')
-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
EXTRA_INCLUDES = -I$(CURDIR)/include \
@@ -10,32 +7,31 @@
EXTRA_LD_PATH = -L$(CURDIR)/linux_lib/libcrystalhd
+EXTRA_CPPFLAGS:=$(EXTRA_INCLUDES) $(shell dpkg-buildflags --get CPPFLAGS)
+EXTRA_CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+EXTRA_CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+EXTRA_LDFLAGS:=$(EXTRA_LD_PATH) $(shell dpkg-buildflags --get LDFLAGS)
+
%:
- dh $@ --with dkms
+ dh $@
override_dh_auto_build:
- make -C linux_lib/libcrystalhd
+ make -C linux_lib/libcrystalhd EXTRA_CPPFLAGS="$(shell dpkg-buildflags --get
CPPFLAGS)" \
+ EXTRA_CXXFLAGS="$(EXTRA_CXXFLAGS)" \
+ EXTRA_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
cd filters/gst/gst-plugin && \
- ./configure --prefix=/usr CFLAGS="$(EXTRA_INCLUDES)" \
- LDFLAGS="$(EXTRA_LD_PATH)"
+ ./configure --prefix=/usr CPPFLAGS="$(EXTRA_CPPFLAGS)" \
+ CFLAGS="$(EXTRA_CFLAGS)" \
+ LDFLAGS="$(EXTRA_LDFLAGS)"
make -C filters/gst/gst-plugin
override_dh_auto_install:
make install -C linux_lib/libcrystalhd DESTDIR=$(CURDIR)/debian/tmp \
LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
make install -C filters/gst/gst-plugin DESTDIR=$(CURDIR)/debian/tmp
- mkdir -p $(CURDIR)/debian/tmp/usr/src/crystalhd-$(UPSTREAM_VERSION)
- cp -rf driver $(CURDIR)/debian/tmp/usr/src/crystalhd-$(UPSTREAM_VERSION)
- cp -rf include $(CURDIR)/debian/tmp/usr/src/crystalhd-$(UPSTREAM_VERSION)
- rm -f
$(CURDIR)/debian/tmp/usr/src/crystalhd-$(UPSTREAM_VERSION)/driver/linux/bcm_70012_dev.sh
- rm -f
$(CURDIR)/debian/tmp/usr/src/crystalhd-$(UPSTREAM_VERSION)/driver/linux/bcm_70012_run.sh
- install -D -m 0644 driver/linux/20-crystalhd.rules
$(CURDIR)/debian/tmp/lib/udev/rules.d/20-crystalhd.rules
override_dh_auto_clean:
dh_clean
make clean -C linux_lib/libcrystalhd
[ ! -f filters/gst/gst-plugin/Makefile ] || \
make clean distclean -C filters/gst/gst-plugin
-
-override_dh_dkms:
- dh_dkms -V $(UPSTREAM_VERSION)
unblock crystalhd/1:0.0~git20110715.fdd2f19-8
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
