diff --git a/.github/workflows/release_i386.yml b/.github/workflows/release_i386.yml new file mode 100644 index 0000000..fa8a532 --- /dev/null +++ b/.github/workflows/release_i386.yml @@ -0,0 +1,50 @@ +name: PikaOS Package Release (i386) + +on: + workflow_dispatch + +jobs: + build: + runs-on: self-hosted + container: + image: ghcr.io/pikaos-linux/pika-i386-package-container:latest + volumes: + - /proc:/proc + options: --privileged -it + + steps: + - uses: actions/checkout@v3 + + - name: Import GPG key + id: import_gpg + uses: crazy-max/ghaction-import-gpg@v5 + with: + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + passphrase: ${{ secrets.PASSPHRASE }} + + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_KEY }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + if_key_exists: replace + + - name: Update apt cache + run: apt-get update -y + + - name: Build Package + run: ./main.sh + + - name: Release Package + run: ./release.sh + + - name: Purge cache + uses: strrife/cloudflare-chunked-purge-action@master + env: + # Zone is required by both authentication methods + CLOUDFLARE_ZONE: ${{ secrets.CLOUDFLARE_ZONE }} + + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} + PURGE_URLS: ${{ vars.PURGE_URLS }} + diff --git a/debian/changelog b/debian/changelog index 328bc5c..6e86f45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,396 @@ -upstream-name (pkgver-pkgrel) distro_codename; urgency=medium +intel-media-driver-non-free (23.3.5-100pika1) pikauwu; urgency=medium - * Initial release. (Closes: #nnnn) + * New upstream version 23.3.5 - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 + -- Sebastian Ramacher Sat, 21 Oct 2023 21:51:28 +0200 + +intel-media-driver-non-free (23.3.4+ds1-1) unstable; urgency=medium + + * New upstream version 23.3.4+ds1 + * debian/patches: Refresh patches + + -- Sebastian Ramacher Sun, 15 Oct 2023 23:09:40 +0200 + +intel-media-driver-non-free (23.3.2+ds1-1) unstable; urgency=medium + + * New upstream version 23.3.2+ds1 + * debian/: Build with ninja + + -- Sebastian Ramacher Sat, 02 Sep 2023 20:54:59 +0200 + +intel-media-driver-non-free (23.2.3+ds1-1) unstable; urgency=medium + + * New upstream version 23.2.3+ds1 + + -- Sebastian Ramacher Sat, 01 Jul 2023 18:08:32 +0200 + +intel-media-driver-non-free (23.1.2+ds1-1) unstable; urgency=medium + + * New upstream version 23.1.2+ds1 + + -- Sebastian Ramacher Fri, 03 Mar 2023 21:39:25 +0100 + +intel-media-driver-non-free (23.1.1+ds1-1) unstable; urgency=medium + + * New upstream version 23.1.1+ds1 + + -- Sebastian Ramacher Sat, 18 Feb 2023 13:50:55 +0100 + +intel-media-driver-non-free (23.1.0+ds1-1) unstable; urgency=medium + + * New upstream version 23.1.0+ds1 + + -- Sebastian Ramacher Sat, 21 Jan 2023 23:09:08 +0100 + +intel-media-driver-non-free (22.6.6+ds1-1) unstable; urgency=medium + + * New upstream version 22.6.6+ds1 + + -- Sebastian Ramacher Sun, 15 Jan 2023 15:15:17 +0100 + +intel-media-driver-non-free (22.6.5+ds1-1) unstable; urgency=medium + + * New upstream version 22.6.5+ds1 + * debian/control: Bump Standards-Version + + -- Sebastian Ramacher Thu, 05 Jan 2023 14:12:15 +0100 + +intel-media-driver-non-free (22.6.4+ds1-1) unstable; urgency=medium + + * New upstream version 22.6.4+ds1 + + -- Sebastian Ramacher Sat, 10 Dec 2022 23:10:41 +0100 + +intel-media-driver-non-free (22.6.3+ds1-1) unstable; urgency=medium + + * New upstream version 22.6.3+ds1 + + -- Sebastian Ramacher Mon, 21 Nov 2022 22:47:58 +0100 + +intel-media-driver-non-free (22.6.1+ds1-1) unstable; urgency=medium + + * New upstream version 22.6.1+ds1 + + -- Sebastian Ramacher Sun, 06 Nov 2022 19:43:43 +0100 + +intel-media-driver-non-free (22.6.0+ds1-1) unstable; urgency=medium + + * New upstream version 22.6.0+ds1 + + -- Sebastian Ramacher Sun, 23 Oct 2022 11:49:49 +0200 + +intel-media-driver-non-free (22.5.4+ds1-1) unstable; urgency=medium + + * New upstream version 22.5.4+ds1 + * debian/patches: Drop patches integrated upstream + + -- Sebastian Ramacher Sat, 01 Oct 2022 19:03:04 +0200 + +intel-media-driver-non-free (22.5.3+ds1-2) unstable; urgency=medium + + * debian/patches: Apply upstream fix for i386 FTBFS (Closes: #1020521) + * debian/rules: + - Disable -Werror + - Set ARCH + + -- Sebastian Ramacher Fri, 23 Sep 2022 23:38:40 +0200 + +intel-media-driver-non-free (22.5.3+ds1-1) unstable; urgency=medium + + * New upstream version 22.5.3+ds1 + + -- Sebastian Ramacher Mon, 29 Aug 2022 21:33:08 +0200 + +intel-media-driver-non-free (22.5.2+ds1-1) unstable; urgency=medium + + * New upstream version 22.5.2+ds1 + + -- Sebastian Ramacher Tue, 16 Aug 2022 20:57:22 +0200 + +intel-media-driver-non-free (22.5.1+ds1-1) unstable; urgency=medium + + * New upstream version 22.5.1+ds1 + + -- Sebastian Ramacher Tue, 02 Aug 2022 21:18:24 +0200 + +intel-media-driver-non-free (22.4.3+ds1-1) unstable; urgency=medium + + * New upstream version 22.4.3+ds1 + + -- Sebastian Ramacher Thu, 16 Jun 2022 22:48:53 +0200 + +intel-media-driver-non-free (22.4.2+ds1-1) unstable; urgency=medium + + * New upstream version 22.4.2+ds1 + * debian/control: Bump Standards-Version + + -- Sebastian Ramacher Thu, 26 May 2022 10:26:53 +0200 + +intel-media-driver-non-free (22.4.0+ds1-1) unstable; urgency=medium + + * New upstream version 22.4.0+ds1 + + -- Sebastian Ramacher Sun, 24 Apr 2022 22:52:03 +0200 + +intel-media-driver-non-free (22.3.1+ds1-1) unstable; urgency=medium + + * New upstream version 22.3.1+ds1 + + -- Sebastian Ramacher Mon, 04 Apr 2022 23:37:05 +0200 + +intel-media-driver-non-free (22.3.0+ds1-1) unstable; urgency=medium + + * New upstream version 22.3.0+ds1 + + -- Sebastian Ramacher Sat, 19 Mar 2022 23:36:04 +0100 + +intel-media-driver-non-free (22.2.1+ds1-1) unstable; urgency=medium + + * New upstream version 22.2.1+ds1 + + -- Sebastian Ramacher Wed, 23 Feb 2022 08:51:55 +0100 + +intel-media-driver-non-free (22.2.0+ds1-1) unstable; urgency=medium + + * New upstream version 22.2.0+ds1 + + -- Sebastian Ramacher Sun, 13 Feb 2022 18:29:21 +0100 + +intel-media-driver-non-free (22.1.1+ds1-1) unstable; urgency=medium + + * New upstream version 22.1.1+ds1 + + -- Sebastian Ramacher Mon, 07 Feb 2022 22:24:15 +0100 + +intel-media-driver-non-free (22.1.0+ds1-1) unstable; urgency=medium + + * New upstream version 22.1.0+ds1 + + -- Sebastian Ramacher Thu, 30 Dec 2021 22:36:27 +0100 + +intel-media-driver-non-free (21.4.2+ds1-1) unstable; urgency=medium + + * New upstream version 21.4.2+ds1 + + -- Sebastian Ramacher Sun, 28 Nov 2021 15:54:07 +0100 + +intel-media-driver-non-free (21.4.1+ds1-1) unstable; urgency=medium + + * New upstream version 21.4.1+ds1 + + -- Sebastian Ramacher Wed, 10 Nov 2021 20:53:43 +0100 + +intel-media-driver-non-free (21.4.0+ds1-1) unstable; urgency=medium + + * New upstream version 21.4.0+ds1 + + -- Sebastian Ramacher Fri, 29 Oct 2021 17:29:12 +0200 + +intel-media-driver-non-free (21.3.4+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Fri, 01 Oct 2021 19:43:34 +0200 + +intel-media-driver-non-free (21.3.3+ds1-1) unstable; urgency=medium + + [ Debian Janitor ] + * Set upstream metadata fields: Bug-Database, Bug-Submit. + + [ Sebastian Ramacher ] + * New upstream release + * debian/control: + - Bump libva B-D + - Bump Standards-Version + + -- Sebastian Ramacher Sun, 05 Sep 2021 21:35:42 +0200 + +intel-media-driver-non-free (21.3.2+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Tue, 31 Aug 2021 20:32:16 +0200 + +intel-media-driver-non-free (21.3.1+ds1-2) unstable; urgency=medium + + * Upload to unstable + * New upstream release + + -- Sebastian Ramacher Sun, 15 Aug 2021 19:04:41 +0200 + +intel-media-driver-non-free (21.3.0+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Wed, 04 Aug 2021 23:00:19 +0200 + +intel-media-driver-non-free (21.2.2+ds1-1) experimental; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Wed, 23 Jun 2021 00:08:54 +0200 + +intel-media-driver-non-free (21.1.3+ds1-1) experimental; urgency=medium + + * New upstream release + * debian/copyright: Bump copyright years + * debian/control: Bump libigdgmm-dev BD + + -- Sebastian Ramacher Mon, 05 Apr 2021 14:55:45 +0200 + +intel-media-driver-non-free (21.1.1+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Fri, 05 Feb 2021 22:09:37 +0100 + +intel-media-driver-non-free (21.1.0+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Tue, 26 Jan 2021 20:32:56 +0100 + +intel-media-driver-non-free (20.4.5+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Sat, 02 Jan 2021 17:03:51 +0100 + +intel-media-driver-non-free (20.4.3+ds1-1) unstable; urgency=medium + + * New upstream version 20.4.3+ds1 + - Fix crash on H.264 encoding (Closes: #977286) + * debian/control: Bump libigdgmm-dev BD + + -- Sebastian Ramacher Sun, 13 Dec 2020 18:07:37 +0100 + +intel-media-driver-non-free (20.4.2+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/control: Bump Standards-Version + + -- Sebastian Ramacher Wed, 02 Dec 2020 20:52:38 +0100 + +intel-media-driver-non-free (20.4.1+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Sun, 15 Nov 2020 17:09:28 +0100 + +intel-media-driver-non-free (20.3.0+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/control: + - Bump libva B-D + - Remove libpciaccess-dev from B-D + + -- Sebastian Ramacher Sun, 04 Oct 2020 20:58:57 +0200 + +intel-media-driver-non-free (20.2.0+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/control: Bump debhelper compat to 13 + + -- Sebastian Ramacher Sun, 12 Jul 2020 11:03:36 +0200 + +intel-media-driver-non-free (20.1.1+ds1-1) unstable; urgency=medium + + * New upstream release + + -- Sebastian Ramacher Thu, 09 Apr 2020 12:01:14 +0200 + +intel-media-driver-non-free (19.4.1+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/watch: Revert "Check for Xr releases" + + -- Sebastian Ramacher Thu, 02 Apr 2020 13:08:07 +0200 + +intel-media-driver-non-free (19.4.0r+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/: Remove note about changing LIBVA_DRIVER + * debian/control: Bump Standards-Version + + -- Sebastian Ramacher Wed, 05 Feb 2020 20:15:04 +0100 + +intel-media-driver-non-free (19.4.0+ds1-1) unstable; urgency=medium + + * New upstream release + * debian/control: Bump libva-dev B-D + + -- Sebastian Ramacher Tue, 24 Dec 2019 14:42:49 +0100 + +intel-media-driver-non-free (19.3.1+ds1-1) unstable; urgency=medium + + * New upstream release. + + -- Sebastian Ramacher Fri, 01 Nov 2019 09:43:57 +0100 + +intel-media-driver-non-free (19.3.0+ds1-1) unstable; urgency=medium + + * New upstream release. + * debian/control: Bump Standards-Version + * debian/patches: Refresh patches + * debian/copyright: + - Bump copyright years + - Remove Christoph Rau + + -- Sebastian Ramacher Sun, 13 Oct 2019 14:31:59 +0200 + +intel-media-driver-non-free (19.2.1+ds1-2) unstable; urgency=medium + + * debian/rules: Run tests only on Intel CPUs. + * debian/patches: Remove an obsolete compile flag. (Closes: #935000) + + -- Sebastian Ramacher Thu, 22 Aug 2019 18:40:41 +0200 + +intel-media-driver-non-free (19.2.1+ds1-1) unstable; urgency=medium + + * New upstream release. + + -- Sebastian Ramacher Sat, 10 Aug 2019 18:35:17 +0200 + +intel-media-driver-non-free (19.2.0+ds1-1) unstable; urgency=medium + + * New upstream release. + * debian/control: + - Bump Standards-Version. + - Bump libigdgmm-dev B-D. + + -- Sebastian Ramacher Sun, 07 Jul 2019 18:22:41 +0200 + +intel-media-driver-non-free (18.4.1+ds1-1) unstable; urgency=medium + + * New upstream release. + * debian/watch: Ignore pre-releases. + + -- Sebastian Ramacher Sun, 07 Apr 2019 14:13:11 +0200 + +intel-media-driver-non-free (18.4.0+ds1-1) unstable; urgency=medium + + * New upstream release. + * debian/copyright: Refine Files-Excluded. + * debian/rules: Explicitly specify desired build flags wrt kernels. + * debian/patches: Refresh patches. + * debian/: Bump debhelper compat to 12 + * debian/control: + - Bump Standards-Version. + - Mention Whiskey Lake. + + -- Sebastian Ramacher Sat, 02 Feb 2019 19:43:01 +0100 + +intel-media-driver-non-free (18.3.0+ds1-2) unstable; urgency=medium + + * debian/: Fix build on i386. (Closes: #915572) + - debian/patches: Do not define __AMD64__ and avoid -m64 when building for + i386. + - debian/rules: Enable LFS support. + + -- Sebastian Ramacher Mon, 10 Dec 2018 23:10:55 +0100 + +intel-media-driver-non-free (18.3.0+ds1-1) unstable; urgency=medium + + * Initial release. (Closes: #909984) + + -- Sebastian Ramacher Mon, 19 Nov 2018 23:21:00 +0100 diff --git a/debian/control b/debian/control index 0bcd8e0..65550f4 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,52 @@ -Source: upstream-name -Section: admin +Source: intel-media-driver-non-free +Section: non-free/video Priority: optional -Maintainer: name -Standards-Version: 4.6.1 -Build-Depends: debhelper-compat (= 13) +Maintainer: Debian Multimedia Maintainers +Uploaders: + Sebastian Ramacher +Build-Depends: + debhelper-compat (= 13), + dh-sequence-libva, + cmake, + libdrm-dev, + libigdgmm-dev (>= 21.1.1), + libva-dev (>= 2.12), + libx11-dev, + ninja-build, + pkg-config, +Standards-Version: 4.6.2 +Homepage: https://github.com/intel/media-driver +Vcs-Browser: https://salsa.debian.org/multimedia-team/intel-media-driver-non-free +Vcs-Git: https://salsa.debian.org/multimedia-team/intel-media-driver-non-free.git +XS-Autobuild: yes Rules-Requires-Root: no -Package: pkgname1 -Architecture: linux-any -# Delete any of these lines if un-used -Depends: ${misc:Depends}, depends -Recommends: high priority optdepends -Conflicts: conflicts -Suggests: low priority optdepends -Breaks: also conflicts!? -Provides: provides -# -Description: pkgdesc +Package: intel-media-va-driver-non-free +Architecture: amd64 i386 x32 +Multi-Arch: same +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Provides: + va-driver +Conflicts: + intel-media-va-driver +Description: VAAPI driver for the Intel GEN8+ Graphics family + The VA-API (Video Acceleration API) enables hardware accelerated video + decode/encode at various entry-points (VLD, IDCT, Motion Compensation + etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 + ASP/H.263, MPEG-4 AVC/H.264, and VC-1/WMV3). It provides an interface + to fully expose the video decode capabilities in today's GPUs. + . + This package contains the video decode and encode driver backend for the + Intel HD Graphics of the Intel Core processor family. The supported platforms + include: + * Broadwell + * Skylake + * Broxton + * Apollo Lake + * Kaby Lake + * Coffee Lake + * Whiskey Lake + * Cannon Lake + * Ice Lake diff --git a/debian/copyright b/debian/copyright index e69de29..7b89db8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -0,0 +1,70 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/intel/media-driver +Comment: + This package contains intel-media-driver with its non-free kernels. We have to + move those kernels to non-free as they come without source, i.e. we cannot + rebuild them with intel-gen4asm (or similar). But otherwise the package can be + autobuilt. +Files-Excluded: Tools/MediaDriverTools/UMDPerfProfiler/* + +Files: * +Copyright: 2007-2008, Dave Airlie + 2007-2021, Intel Corporation + 2007-2008, Jakob Bornecrantz + 2014, NVIDIA Corporation + 2007-2008, Red Hat Inc + 2010, The WebM project authors + 2002-2008, Tungsten Graphics, Inc. + 1999-2000, Precision Insight, Inc. + 2000, VA Linux Systems, Inc. +License: Expat + +Files: media_driver/linux/ult/ult_app/googletest/* +Copyright: 2003-2015, Google Inc +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * The names of its contributors may not be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/* +Copyright: 2018-2021 Sebastian Ramacher +License: Expat + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/rules b/debian/rules index ed40aff..07e56b3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,80 +1,23 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -## See debhelper(7) (uncomment to enable). -## Output every command that modifies files on the build system. -export DH_VERBOSE = 1 +include /usr/share/dpkg/architecture.mk -## === Set paths env vars === +export DEB_BUILD_MAINT_OPTIONS=future=+lfs -## Source directory, called upon by $(srcdir) -srcdir = $(shell debian/scripts/get_pwd.sh) -## The Root of package number one, called upon by $(pkgdir1) -pkgdir1 = $(srcdir)/debian/pkgdir1 -## The Root of package number two, you can add as many of these as you like -pkgdir2 = $(srcdir)/debian/pkgdir2 - -## If building a singular package you can remove the number, and as you guessed you call upon it with $(pkgdir) -# pkgdir = $(srcdir)/debian/pkgdir - -## === End end of region === - -## === the chain of command === -## debuild runs a chain of dh functions in the following order: -## dh_testdir -## dh_clean -## dh_auto_clean -## dh_update_autotools_config -## dh_autoreconf -## dh_auto_configure -## dh_prep -## dh_build -## dh_auto_build -## dh_install -## dh_auto_install -## dh_installdocs -## dh_installchangelogs -## dh_perl -## dh_link -## dh_strip_nondeterminism -## dh_compress -## dh_fixperms -## dh_missing -## dh_dwz -## dh_strip -## dh_makeshlibs -## dh_shlibdeps -## dh_installdeb -## dh_gencontrol -## but you are most likely to only need to override the following: -## dh_clean -## dh_auto_configure -## dh_build -## dh_install - -## === End end of region === - -## === overriding dh functions === -## by default all dh functions will run a specific command based on the build system selected by "dh $@" -## if you have a makefile that does everything you need this is fine, -## but most likely you have no MakeFile and you want to add your own commands -## Note : overrides must be places above %: -## So here's a few examples: - -## overriding dh_clean to make it not delete rust vendor files: -#override_dh_clean: -# echo "disabled" - -## overriding dh_auto_configure to add custom configs: -#override_dh_auto_configure: -# $(srcdir)/configure -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -DBUILD_PLUGIN=OFF - -## overriding dh_install to install files to a package: -#override_dh_auto_configure: -# mkdir -p $(pkgdir1)/usr/bin -# cp $(srcdir)/pikman $(pkgdir1)/usr/bin/ - -## === End end of region === - -## This here will start the build: %: - dh $@ + dh $@ -Scmake+ninja + +override_dh_auto_configure: + dh_auto_configure -- \ + -DINSTALL_DRIVER_SYSCONF=OFF \ + -DENABLE_KERNELS=ON \ + -DENABLE_NONFREE_KERNELS=ON \ + -DBUILD_CMRTLIB=OFF \ + -DARCH=$(DEB_HOST_ARCH_BITS) \ + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + +override_dh_auto_test: +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + # Requires Broadwell or newer, so check for SSE 4.2 support at least. + if grep -q sse4_2 /proc/cpuinfo && grep -q GenuineIntel /proc/cpuinfo; then dh_auto_test; fi +endif diff --git a/debian/scripts/get_pwd.sh b/debian/scripts/get_pwd.sh deleted file mode 100755 index ef98ce9..0000000 --- a/debian/scripts/get_pwd.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -env | grep -w "PWD" | cut -c5- diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..7f73e72 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,3 @@ +--- +Bug-Database: https://github.com/intel/media-driver/issues +Bug-Submit: https://github.com/intel/media-driver/issues/new diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9231f8d --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 +opts="dversionmangle=auto,repacksuffix=+ds1" \ + https://github.com/intel/media-driver/tags \ + (?:.*?/)intel-media[-_]?(?!600\.0)(\d[\-+\.:\~\d]*)\.tar\.gz diff --git a/main.sh b/main.sh index 4fd7b08..af279fd 100755 --- a/main.sh +++ b/main.sh @@ -3,9 +3,12 @@ DEBIAN_FRONTEND=noninteractive # Clone Upstream -mkdir -p ./src-pkg-name -cp -rvf ./debian ./src-pkg-name/ -cd ./src-pkg-name/ +wget http://deb.debian.org/debian/pool/non-free/i/intel-media-driver-non-free/intel-media-driver-non-free_23.3.5+ds1.orig.tar.xz +tar -xf ./intel-media-driver-non-free_23.3.5+ds1.orig.tar.xz +mv -v ./media-driver-intel-media-23.3.5 ./media-driver-intel-media +cp -rvf ./debian ./media-driver-intel-media/ +cd ./media-driver-intel-media/ +for i in $(cat ../patches/series) ; do echo "Applying Patch: $i" && patch -Np1 -i ../patches/$i || bash -c "echo "Applying Patch $i Failed!" && exit 2"; done # Get build deps apt-get build-dep ./ -y diff --git a/patches/0001-Integrate-unit-tests-in-cmake-s-test-framework.patch b/patches/0001-Integrate-unit-tests-in-cmake-s-test-framework.patch new file mode 100644 index 0000000..f707412 --- /dev/null +++ b/patches/0001-Integrate-unit-tests-in-cmake-s-test-framework.patch @@ -0,0 +1,59 @@ +From: Sebastian Ramacher +Date: Mon, 19 Nov 2018 22:35:07 +0100 +Subject: Integrate unit tests in cmake's test framework + +--- + CMakeLists.txt | 1 + + media_driver/linux/ult/CMakeLists.txt | 7 ------- + media_driver/linux/ult/ult_app/CMakeLists.txt | 12 ++++-------- + 3 files changed, 5 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a4e8a41..6b69f90 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,7 @@ if (BUILD_KERNELS) + add_subdirectory(Tools/MediaDriverTools) + endif() + ++enable_testing() + add_subdirectory(media_driver) + + if("${LIBVA_DRIVERS_PATH}" STREQUAL "") +diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt +index 9fb5b39..4f54575 100644 +--- a/media_driver/linux/ult/CMakeLists.txt ++++ b/media_driver/linux/ult/CMakeLists.txt +@@ -51,10 +51,3 @@ endif () + + add_subdirectory(libdrm_mock) + add_subdirectory(ult_app) +- +-enable_testing() +-add_test(NAME test_devult COMMAND devult ${UMD_PATH}) +-set_tests_properties(test_devult +- PROPERTIES PASS_REGULAR_EXPRESSION "PASS") +-set_tests_properties(test_devult +- PROPERTIES FAIL_REGULAR_EXPRESSION "FAIL") +diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt +index a232ee3..c8df9db 100644 +--- a/media_driver/linux/ult/ult_app/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt +@@ -75,13 +75,9 @@ if (DEFINED BYPASS_MEDIA_ULT AND "${BYPASS_MEDIA_ULT}" STREQUAL "yes") + message("-- media -- BYPASS_MEDIA_ULT = ${BYPASS_MEDIA_ULT}") + else () + if (ENABLE_NONFREE_KERNELS) +- add_custom_target(RunULT ALL DEPENDS ${LIB_NAME} devult) +- +- add_custom_command( +- TARGET RunULT +- POST_BUILD +- COMMAND LD_PRELOAD=${MEDIA_MISC_LIB}:../libdrm_mock/libdrm_mock.so ./devult ../../../${LIB_NAME}.so +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMENT "Running devult...") ++ add_test( ++ NAME ULT ++ COMMAND env LD_PRELOAD=$ $ ../../../${LIB_NAME}.so ++ ) + endif () + endif () diff --git a/patches/0002-Remove-settings-based-on-ARCH.patch b/patches/0002-Remove-settings-based-on-ARCH.patch new file mode 100644 index 0000000..eafbd9a --- /dev/null +++ b/patches/0002-Remove-settings-based-on-ARCH.patch @@ -0,0 +1,36 @@ +From: Sebastian Ramacher +Date: Mon, 10 Dec 2018 22:59:20 +0100 +Subject: Remove settings based on ARCH + +--- + media_driver/cmake/linux/media_compile_flags_linux.cmake | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake +index 0a211fd..69c6140 100755 +--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake +@@ -53,8 +53,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON + + # Enable c++14 features + -std=c++14 +- # -m32 or -m64 +- -m${ARCH} + + # Global defines + -DLINUX=1 +@@ -80,14 +78,6 @@ if(${UFO_MARCH} STREQUAL "slm") + ) + endif() + +-if(${ARCH} STREQUAL "64") +- set(MEDIA_COMPILER_FLAGS_COMMON +- ${MEDIA_COMPILER_FLAGS_COMMON} +- -D_AMD64_ +- -D__CT__ +- ) +-endif() +- + if(NOT ${PLATFORM} STREQUAL "android") + set(MEDIA_COMPILER_FLAGS_COMMON + ${MEDIA_COMPILER_FLAGS_COMMON} diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..4fa9b7a --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +0001-Integrate-unit-tests-in-cmake-s-test-framework.patch +0002-Remove-settings-based-on-ARCH.patch