From: Marshall Banana Date: Tue, 23 Dec 2014 19:53:39 +0000 (+0100) Subject: Imported Debian patch 1.4+222+hg5f9f7194267b-1~trusty X-Git-Tag: debian/1.4+222+hg5f9f7194267b-1_trusty^0 X-Git-Url: https://git.piment-noir.org/?p=deb_x265.git;a=commitdiff_plain;h=e2e7a0aa019812e0b1f7db9f9558f80939628fb7 Imported Debian patch 1.4+222+hg5f9f7194267b-1~trusty --- e2e7a0aa019812e0b1f7db9f9558f80939628fb7 diff --cc debian/changelog index eaa41cc,0000000..cf4aaf1 mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,131 -1,0 +1,171 @@@ - x265 (1.4-4~ubuntu1) trusty; urgency=medium ++x265 (1.4+222+hg5f9f7194267b-1~trusty) trusty; urgency=low + - * Support for ARMv7 with NEON extensions ++ * Current snapshot + - -- Jérôme Benoit Tue, 09 Dec 2014 22:19:18 +0100 ++ -- Marshall Banana Tue, 23 Dec 2014 20:53:39 +0100 ++ ++x265 (1.4+179-hg88498ec9b10b-1~trusty1) trusty; urgency=low ++ ++ * Current snapshot ++ ++ -- Marshall Banana Tue, 09 Dec 2014 13:40:18 +0100 ++ ++x265 (1.4+164-hg511dde5ac1de-1~trusty) trusty; urgency=low ++ ++ * Latest snapshot with API version 39 ++ ++ -- Marshall Banana Tue, 09 Dec 2014 05:49:59 +0100 ++ ++x265 (1.4+154-hgde54cffaecf2-2~trusty) trusty; urgency=low ++ ++ * Don't install manpages in lib packages to avoid package conflicts. ++ ++ -- Marshall Banana Wed, 03 Dec 2014 18:51:58 +0100 ++ ++x265 (1.4+154-hgde54cffaecf2-1~trusty) trusty; urgency=low ++ ++ * Current snapshot ++ ++ -- Marshall Banana Wed, 03 Dec 2014 16:32:16 +0100 ++ ++x265 (1.4-5~trusty) trusty; urgency=low ++ ++ * Build manpages from documentation source files, including libx265.3 ++ * Typo in docs: '--chromalocs' -> '--chromaloc' ++ * Upstream bugfixes: ++ * luma_hpp[4x4]: AVX2 asm code bug fix ++ * analysis: explicit locking for pmode and pme parameters ++ ++ -- Marshall Banana Mon, 24 Nov 2014 16:26:11 +0100 ++ ++x265 (1.4-4~trusty1) trusty; urgency=low ++ ++ * Build static libraries without -fPIC ++ ++ -- Marshall Banana Wed, 19 Nov 2014 14:43:48 +0100 + +x265 (1.4-3~trusty) trusty; urgency=low + + * Upstream bugfixes: + * cli: bug fix for validatefanout param analysis-mode=save and load + * docs: fix reST parsing issues + + -- Marshall Banana Wed, 05 Nov 2014 01:29:32 +0100 + +x265 (1.4-2~trusty2) trusty; urgency=low + + * Install documentation in x265-doc package to avoid package conflicts + + -- Marshall Banana Sat, 01 Nov 2014 02:49:51 +0100 + +x265 (1.4-1~trusty) trusty; urgency=low + + * New upstream release + + -- Marshall Banana Sat, 01 Nov 2014 00:20:42 +0100 + +x265 (1.3-4~trusty) trusty; urgency=low + + * Update manpage + + -- Marshall Banana Wed, 01 Oct 2014 18:09:33 +0200 + +x265 (1.3-3~trusty) trusty; urgency=low + + * Rename x265-10b to x265-10bit + * Provide x265-16bit via symbolic link + + -- Marshall Banana Wed, 01 Oct 2014 17:56:41 +0200 + +x265 (1.3-2~trusty) trusty; urgency=low + + * Add doc-base control file + + -- Marshall Banana Fri, 05 Sep 2014 04:07:20 +0200 + +x265 (1.3-1~trusty) trusty; urgency=low + + * New upstream release + + -- Marshall Banana Fri, 22 Aug 2014 20:30:50 +0200 + +x265 (1.2+510-hg2bdcfcc1bb33-1~trusty) trusty; urgency=low + + * Current snapshot + + -- Marshall Banana Mon, 11 Aug 2014 12:51:05 +0200 + +x265 (1.2-3~trusty) trusty; urgency=low + + * Build static library from different object files + + -- Marshall Banana Mon, 21 Jul 2014 05:29:20 +0200 + +x265 (1.2-2~trusty1) trusty; urgency=low + + * Provide separate optimized shared libraries for i686 + + -- Marshall Banana Fri, 11 Jul 2014 20:36:37 +0200 + +x265 (1.2-1~trusty) trusty; urgency=low + + * New upstream version + * Update patch + * Update man page + * Install upstream changelog + + -- Marshall Banana Thu, 10 Jul 2014 19:40:33 +0200 + +x265 (1.1-4~trusty) trusty; urgency=low + + * Install 10bit binary to make usage of 10bit library possible. + + -- Marshall Banana Tue, 17 Jun 2014 10:53:50 +0200 + +x265 (1.1-3~trusty) trusty; urgency=low + + * Don't rename 10 bit library + + -- Marshall Banana Fri, 13 Jun 2014 16:43:34 +0200 + +x265 (1.1-2~trusty) trusty; urgency=low + + * Build less packages + + -- Marshall Banana Wed, 11 Jun 2014 03:47:39 +0200 + +x265 (1.1-1~trusty) trusty; urgency=low + + * New upstream version + + -- Marshall Banana Fri, 13 Jun 2014 16:42:16 +0200 + +x265 (1.1) unstable; urgency=low + + * New upstream version + + -- Marshall Banana Sat, 07 Jun 2014 17:44:06 +0200 + +x265 (1.0+5-dcf74ea39e31) unstable; urgency=low + + * New upstream version + + -- Marshall Banana Sun, 04 May 2014 19:07:30 +0100 + +x265 (0.9+114-c630b0b393ee) unstable; urgency=low + + * New upstream version + + -- Marshall Banana Fri, 04 Apr 2014 01:45:30 +0100 + +x265 (0.8+52-93861c42b879) unstable; urgency=low + + * New upstream version + + -- Marshall Banana Sat, 08 Mar 2014 10:08:00 +0100 + +x265 (0.7+216-591ca91f0501) unstable; urgency=low + + * Initial upload + + -- Marshall Banana Wed, 19 Feb 2014 21:30:00 +0100 diff --cc debian/confflags index 714d8c1,0000000..6ae0f49 mode 100644,000000..100644 --- a/debian/confflags +++ b/debian/confflags @@@ -1,45 -1,0 +1,44 @@@ ++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ++ ++CFLAGS := -O3 $(filter-out -g -O2,$(shell dpkg-buildflags --get CFLAGS)) $(CPPFLAGS) ++CXXFLAGS := -O3 $(filter-out -g -O2,$(shell dpkg-buildflags --get CXXFLAGS)) $(CPPFLAGS) ++ +libdir := lib/$(DEB_HOST_MULTIARCH) + + - common_confflags := \ ++common_confflags += \ + -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE=ON + - 8bit_confflags := \ ++ ++shared_confflags := \ + $(common_confflags) \ ++ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ++ -DENABLE_PIC=ON ++ ++8bit_confflags := \ ++ $(shared_confflags) \ + -DLIB_INSTALL_DIR=$(libdir) + +10bit_confflags := \ - $(common_confflags) \ ++ $(shared_confflags) \ + -DBIN_INSTALL_DIR=$(libdir)/x265-10bit \ + -DLIB_INSTALL_DIR=$(libdir)/x265-10bit \ + -DHIGH_BIT_DEPTH=ON + + +static_confflags := \ - -DCMAKE_INSTALL_PREFIX=/usr \ ++ $(common_confflags) \ + -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DENABLE_CLI=OFF \ - -DENABLE_SHARED=OFF ++ -DENABLE_SHARED=OFF \ ++ -DENABLE_PIC=OFF + +8bit_static_confflags := \ + $(static_confflags) \ + -DLIB_INSTALL_DIR=$(libdir) + +10bit_static_confflags := \ + $(static_confflags) \ + -DLIB_INSTALL_DIR=$(libdir)/x265-10bit \ + -DHIGH_BIT_DEPTH=ON + - - # disable assembly on x86 and arm - ifneq (,$(filter i386 i486 i586 i686 pentium arm,$(DEB_HOST_GNU_CPU))) - noasm = -DENABLE_ASSEMBLY=OFF -DCMAKE_CXX_FLAGS='-DX86_64=0' - 8bit_confflags += $(noasm) - 10bit_confflags += $(noasm) - 8bit_static_confflags += $(noasm) - 10bit_static_confflags += $(noasm) - endif - diff --cc debian/control index 35db2b2,0000000..0b09e9f mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,73 -1,0 +1,73 @@@ +Source: x265 +Section: libs +Priority: optional +Maintainer: Marshall Banana +Homepage: https://bitbucket.org/multicoreware/x265/wiki/Home +Standards-Version: 3.9.5 +Build-Depends: + debhelper (>= 9), + cmake (>= 2.8.8), + python3-sphinx, - yasm (>= 1.2.0) [any-i386] ++ yasm (>= 1.2.0) +Vcs-Browser: https://bitbucket.org/multicoreware/x265/src + +Package: x265 +Architecture: any +Section: video +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: H.265/HEVC video encoder - frontend binary + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + - Package: libx265-35 ++Package: libx265-39 +Architecture: any +Pre-Depends: + ${misc:Pre-Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: H.265/HEVC video encoder - runtime files + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + +Package: libx265-dev +Architecture: any +Section: libdevel +Depends: + ${misc:Depends}, - libx265-35 (= ${binary:Version}) ++ libx265-39 (= ${binary:Version}) +Description: H.265/HEVC video encoder - development files + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + . + This package contains the static library and - headers used to build programs that use libx265-35. ++ headers used to build programs that use libx265-39. + +Package: x265-doc +Architecture: all +Section: doc +Depends: + ${misc:Depends}, + libjs-jquery (>= 1.4), + libjs-underscore +Description: x265 documentation + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + . + This package contains the x265 documentation. + +Package: x265-dbg +Architecture: any +Section: debug +Priority: extra +Depends: + ${misc:Depends}, + x265 (= ${binary:Version}), - libx265-35 (= ${binary:Version}) ++ libx265-39 (= ${binary:Version}) +Description: debugging symbols for x265 and libx265 + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + . + This package contains the debugging symbols for x265. diff --cc debian/control.in index 8703763,0000000..434ba69 mode 100644,000000..100644 --- a/debian/control.in +++ b/debian/control.in @@@ -1,73 -1,0 +1,73 @@@ +Source: x265 +Section: libs +Priority: optional +Maintainer: Marshall Banana +Homepage: https://bitbucket.org/multicoreware/x265/wiki/Home +Standards-Version: 3.9.5 +Build-Depends: + debhelper (>= 9), + cmake (>= 2.8.8), + python3-sphinx, - yasm (>= 1.2.0) [any-i386] ++ yasm (>= 1.2.0) +Vcs-Browser: https://bitbucket.org/multicoreware/x265/src + +Package: x265 +Architecture: any +Section: video +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: H.265/HEVC video encoder - frontend binary + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + +Package: libx265-@API@ +Architecture: any +Pre-Depends: + ${misc:Pre-Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: H.265/HEVC video encoder - runtime files + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + +Package: libx265-dev +Architecture: any +Section: libdevel +Depends: + ${misc:Depends}, + libx265-@API@ (= ${binary:Version}) +Description: H.265/HEVC video encoder - development files + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + . + This package contains the static library and + headers used to build programs that use libx265-@API@. + +Package: x265-doc +Architecture: all +Section: doc +Depends: + ${misc:Depends}, + libjs-jquery (>= 1.4), + libjs-underscore +Description: x265 documentation + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + . + This package contains the x265 documentation. + +Package: x265-dbg +Architecture: any +Section: debug +Priority: extra +Depends: + ${misc:Depends}, + x265 (= ${binary:Version}), + libx265-@API@ (= ${binary:Version}) +Description: debugging symbols for x265 and libx265 + library for encoding video using the High + Efficiency Video Coding (HEVC/H.265) standard. + . + This package contains the debugging symbols for x265. diff --cc debian/patches/series index 1282f51,0000000..1422308 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,7 -1,0 +1,1 @@@ - version.patch +cpu-detection.patch - show-options-using-their-param_parse-names.patch - make_it_clear_that_--fast-cbf_is_innefective_at_lower_rd_levels.patch - bug_fix_for_validatefanout_param_analysis-mode_save_and_load.patch - fix-reST-parsing-issues-in-docs.patch - armv7l-support.patch diff --cc debian/rules index 33f9531,0000000..30cd9d1 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,78 -1,0 +1,80 @@@ +#!/usr/bin/make -f + - DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) - DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) - API ?= $(shell debian/getapi.sh) - LIB = $(CURDIR)/debian/install/usr/lib/$(DEB_HOST_MULTIARCH) - +include debian/confflags + ++API = $(shell debian/getapi.sh) ++LIB = $(CURDIR)/debian/install/usr/lib/$(DEB_HOST_MULTIARCH) ++ +builddir = compiling - x265-clean = rm -rf $(builddir) && mkdir $(builddir) ++x265-clean = rm -rf $(builddir) && mkdir -p $(builddir) +x265-install = $(MAKE) -C $(builddir) install DESTDIR=$(CURDIR)/debian/install +x265-build = dh_auto_build -D$(builddir) +test-build = \ + $(builddir)/x265 --pass 1 --bitrate 10 -o /dev/null debian/test.y4m && \ + $(builddir)/x265 --pass 2 --bitrate 10 -o test.hevc debian/test.y4m + + +%: + dh ${@} --parallel + +override_dh_auto_clean: + dh_auto_clean - rm -rf $(builddir) doc/reST/build debian/install debian/test.y4m ++ dh_auto_clean -Ddoc/reST || true ++ rm -rf $(builddir) debian/install debian/libx265-$(API).* \ ++ debian/test.y4m x265_2pass.log* test.hevc + +override_dh_auto_build: + sed -e 's/@API@/$(API)/g' debian/control.in > debian/control + cp -f debian/libx265N.install debian/libx265-$(API).install + unxz -fk debian/test.y4m.xz +# build x265 8-bit - mkdir $(builddir) ++ mkdir -p $(builddir) + cd $(builddir) && cmake $(8bit_confflags) ../source + $(x265-build) + $(x265-install) +# test x265 8-bit - # $(test-build) ++ $(test-build) +# build x265 10-bit + $(x265-clean) + cd $(builddir) && cmake $(10bit_confflags) ../source + $(x265-build) + $(x265-install) + sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ + debian/x265-10bit.in > $(builddir)/x265-10bit + install -c -D -m755 $(builddir)/x265-10bit $(CURDIR)/debian/install/usr/bin +# test x265 10-bit - # $(test-build) ++ $(test-build) +# build x265 8-bit static + $(x265-clean) + rm -f $(LIB)/libx265.a + cd $(builddir) && cmake $(8bit_static_confflags) ../source + $(x265-build) + install -c -D -m644 $(builddir)/libx265.a $(LIB) +# build x265 10-bit static + $(x265-clean) + rm -f $(LIB)/x265-10bit/libx265.a - cd $(builddir) && cmake $(10bit_static_confflags) ../source ++ cd $(builddir) && cmake $(10bit_static_confflags) -DENABLE_TESTS=ON ../source + $(x265-build) + install -c -D -m644 $(builddir)/libx265.a $(LIB)/x265-10bit +# build documentation - $(MAKE) -C doc/reST pickle html ++ $(MAKE) -C doc/reST pickle html man ++ ++override_dh_auto_test: ++ $(builddir)/test/TestBench + +override_dh_install: + dh_install --list-missing --sourcedir=$(CURDIR)/debian/install + +override_dh_installchangelogs: + dh_installchangelogs -px265-doc -plibx265-$(API) ChangeLog + +override_dh_installdocs: + dh_installdocs -plibx265-$(API) -px265-doc -X.buildinfo + dh_installdocs -px265 -px265-dbg -plibx265-dev --link-doc=libx265-$(API) + +override_dh_strip: + dh_strip --dbg-package=x265-dbg + +override_dh_builddeb: + dh_builddeb -- -Zxz -z9 + diff --cc debian/x265.manpages index 300fc8f,0000000..c13a98f mode 100644,000000..100644 --- a/debian/x265.manpages +++ b/debian/x265.manpages @@@ -1,1 -1,0 +1,2 @@@ - debian/x265.1 ++doc/reST/build/man/libx265.3 ++doc/reST/build/man/x265.1