[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#992078: bullseye-pu: package libbluray/1:1.2.1-4+deb11u1



On 2021-08-10 23:40:20 +0200, Sebastian Ramacher wrote:
> Package: release.debian.org
> Severity: normal
> Tags: bullseye
> User: release.debian.org@packages.debian.org
> Usertags: pu
> X-Debbugs-Cc: sramacher@debian.org
> 
> [ Reason ]
> The BDJ features of libbluray are currently broken due to an
> incompatibility with libasm-java from bullseye. This issue was reported
> as #991991 and is easily fixed by reverting to using the embedded copy
> of libasm.
> 
> [ Impact ]
> Users will be unable to play Blurays with BDJ.
> 
> [ Tests ]
> None, as I don't own a Bluray with BDJ.
> 
> [ Risks ]
> None, as far as I can tell. libbluray-bdj is known to work with the
> embedded copy of libasm.
> 
> [ Checklist ]
>   [x] *all* changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in bullseye
>   [ ] the issue is verified as fixed in unstable
> 
> The issue is currently fixed in experimental and the fix will be
> available in unstable once bullseye is released.

The fix is now available in unstable (and bookworm) and I've also
uploaded 1:1.2.1-4+deb11u1 to bullseye.

Cheers

> 
> [ Changes ]
> Besides changing gbp's branch, the new version unapplies a
> Debian-specific patch and removes libasm-java from Build-Depends.
> Depends is automatically handled by javahelper.
> 
> Cheers
> -- 
> Sebastian Ramacher

> diff --git a/debian/changelog b/debian/changelog
> index 6ea2b74..40e3021 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,11 @@
> +libbluray (1:1.2.1-4+deb11u1) bullseye; urgency=medium
> +
> +  * debian/gbp.conf: Switch to bullseye branch
> +  * debian/: Switch to embedded libasm. The version from libasm-java is too
> +    new. (Closes: #991991)
> +
> + -- Sebastian Ramacher <sramacher@debian.org>  Sun, 08 Aug 2021 23:27:53 +0200
> +
>  libbluray (1:1.2.1-4) unstable; urgency=medium
>  
>    * debian/patches:
> diff --git a/debian/control b/debian/control
> index 11142ed..1a885ba 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -18,8 +18,7 @@ Build-Depends-Indep:
>   ant,
>   doxygen,
>   graphviz,
> - javahelper,
> - libasm-java
> + javahelper
>  Standards-Version: 4.5.1
>  Homepage: http://www.videolan.org/developers/libbluray.html
>  Vcs-Git: https://salsa.debian.org/multimedia-team/libbluray.git
> diff --git a/debian/gbp.conf b/debian/gbp.conf
> index 4f24002..e0f993f 100644
> --- a/debian/gbp.conf
> +++ b/debian/gbp.conf
> @@ -1,3 +1,4 @@
>  [DEFAULT]
>  pristine-tar = True
>  compression = bzip2
> +debian-branch = bullseye
> diff --git a/debian/patches/0002-Use-system-asm-instead-of-embedded-copy.patch b/debian/patches/0002-Use-system-asm-instead-of-embedded-copy.patch
> deleted file mode 100644
> index 54ad932..0000000
> --- a/debian/patches/0002-Use-system-asm-instead-of-embedded-copy.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -From: Sebastian Ramacher <sramacher@debian.org>
> -Date: Wed, 14 Jun 2017 20:22:27 +0200
> -Subject: Use system asm instead of embedded copy
> -
> ----
> - src/libbluray/bdj/build.xml | 14 ++++++++------
> - 1 file changed, 8 insertions(+), 6 deletions(-)
> -
> -diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml
> -index 1753779..19163d1 100644
> ---- a/src/libbluray/bdj/build.xml
> -+++ b/src/libbluray/bdj/build.xml
> -@@ -21,17 +21,15 @@
> - 
> -     <target name="compile" depends="init"
> -             description="compile the source " >
> --        <javac srcdir="${src_asm}" destdir="${build}" debug="yes"
> --               bootclasspath="${bootclasspath}"
> --               source="${java_version_asm}" target="${java_version_asm}">
> --               <compilerarg value="-XDignore.symbol.file"/>
> --               <compilerarg value="-Xlint:-deprecation"/>
> --        </javac>
> -         <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
> -                bootclasspath="${bootclasspath}"
> -                source="${java_version_bdj}" target="${java_version_bdj}">
> -                <compilerarg value="-XDignore.symbol.file"/>
> -                <compilerarg value="-Xlint:-deprecation"/>
> -+               <classpath>
> -+                   <pathelement path="/usr/share/java/asm.jar" />
> -+                   <pathelement path="/usr/share/java/asm-commons.jar" />
> -+               </classpath>
> -         </javac>
> -     </target>
> -     <target name="dist" depends="compile"
> -@@ -39,6 +37,10 @@
> -         <jar jarfile="${dist}/libbluray-${version}.jar" basedir="${build}">
> -             <exclude name="java/awt/**" />
> -             <exclude name="sun/**" />
> -+            <manifest>
> -+                <attribute name="Class-Path" value="/usr/share/java/asm.jar" />
> -+                <attribute name="Class-Path" value="/usr/share/java/asm-commons.jar" />
> -+            </manifest>
> -         </jar>
> -         <jar jarfile="${dist}/libbluray-awt-${version}.jar" basedir="${build}">
> -           <include name="java/awt/**" />
> diff --git a/debian/patches/series b/debian/patches/series
> index 89954be..16342b0 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1,3 +1,2 @@
>  0001-Do-not-download-image-from-the-web.patch
> -0002-Use-system-asm-instead-of-embedded-copy.patch
>  0003-Update-check-for-new-libudfread-pkg-config-file-name.patch




-- 
Sebastian Ramacher

Attachment: signature.asc
Description: PGP signature


Reply to: