rpms
/
libbluray
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:epel9
Branches Tags
rpms:i10ce
rpms:epel10
rpms:i8cf
rpms:i8
rpms:i9ce
rpms:i8c
rpms:c8
rpms:f38
rpms:epel9
...
pull from: rpms:i10ce
Branches Tags
rpms:i10ce
rpms:epel10
rpms:i8cf
rpms:i8
rpms:i9ce
rpms:i8c
rpms:c8
rpms:f38
rpms:epel9

No commits in common. 'epel9' and 'i10ce' have entirely different histories.
epel9 ... i10ce

6 changed files with 94 additions and 38 deletions
Show Stats

35
.gitignore vendored
Unescape View File

@ -1,34 +1 @@
/libbluray-20101021git144a204c02687.tar.bz2
/libbluray-20101028gitc32862b77dea4.tar.bz2
/libbluray-20110107git0e5902ff9a6f1.tar.bz2
/libbluray-20110126gitbbf11e43bd82e.tar.bz2
/libbluray-20110514git46ee2766038e9.tar.bz2
/libbluray-20110710git51d7d60a96d06.tar.bz2
/libbluray-20111023gite037110f11e70.tar.bz2
/libbluray-0.2.1.tar.bz2
/libbluray-0.2.2.tar.bz2
/libbluray-0.2.3.tar.bz2
/libbluray-0.4.0.tar.bz2
/libbluray-0.5.0.tar.bz2
/libbluray-0.6.0.tar.bz2
/libbluray-0.6.1.tar.bz2
/libbluray-0.6.2.tar.bz2
/libbluray-0.7.0.tar.bz2
/libbluray-0.8.0.tar.bz2
/libbluray-0.9.0.tar.bz2
/libbluray-0.9.1.tar.bz2
/libbluray-0.9.2.tar.bz2
/libbluray-0.9.3.tar.bz2
/libbluray-1.0.0.tar.bz2
/libbluray-1.0.1.tar.bz2
/libbluray-1.0.2.tar.bz2
/libbluray-1.1.0.tar.bz2
/libbluray-1.1.1.tar.bz2
/libbluray-1.1.2.tar.bz2
/libbluray-1.2.0.tar.bz2
/libbluray-1.2.1.tar.bz2
/libbluray-1.3.0.tar.bz2
/libbluray-1.3.1.tar.bz2
/libbluray-1.3.2.tar.bz2
/libbluray-1.3.3.tar.bz2
/libbluray-1.3.4.tar.bz2
SOURCES/libbluray-1.3.4.tar.bz2

1
.libbluray.metadata
Unescape View File

@ -0,0 +1 @@
3bcf069bf113de0bca0be41e26fb68c2ea1a2029 SOURCES/libbluray-1.3.4.tar.bz2

0
libbluray-0.8.0-no_doxygen_timestamp.patch → SOURCES/libbluray-0.8.0-no_doxygen_timestamp.patch
Unescape View File

62
SOURCES/libbluray-1.3.4-java_21.patch
Unescape View File

@ -0,0 +1,62 @@
diff --git a/Makefile.am b/Makefile.am
index 24b60f78..6fabf6f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,6 +241,9 @@ pkginclude_HEADERS = \
if USING_BDJAVA_BUILD_JAR
+if USING_JAVAC_21
+java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+else
if USING_JAVAC_12
java_versions = -Djava_version_asm=1.7 -Djava_version_bdj=1.7
else
@@ -250,6 +253,7 @@ else
java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4
endif
endif
+endif
if BDJ_J2SE
awt_src = java-$(BDJ_TYPE):java-build-support
diff --git a/configure.ac b/configure.ac
index c7016344..9a41e120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,12 @@ AC_ARG_WITH([bdj-bootclasspath],
AC_ARG_WITH([java9],
[AS_HELP_STRING([--with-java9], [build with Java 9+ (drop support for Java <1.6) @<:@default=without@:>@])])
+AC_ARG_WITH([java12],
+ [AS_HELP_STRING([--with-java12], [build with Java 12+ @<:@default=without@:>@])])
+
+AC_ARG_WITH([java21],
+ [AS_HELP_STRING([--with-java21], [build with Java 21+ @<:@default=without@:>@])])
+
AC_ARG_WITH([external-libudfread],
[AS_HELP_STRING([--without-external-libudfread],
[build without external libudfread @<:@default=with@:>@])],
@@ -292,11 +298,13 @@ AS_IF([test "x$use_bdjava_jar" = "xyes"], [
dnl check for Java 9+
javac_version=`"$JAVAC" -version 2>&1 | head -n 1`
[with_java9=`echo "$javac_version" | grep -E -q '^javac\ (9|1[0-1])' && echo yes`]
- [with_java12=`echo "$javac_version" | grep -E -q '^javac\ (1[2-9])' && echo yes`]
+ [with_java12=`echo "$javac_version" | grep -E -q '^javac\ (1[2-9]|20)' && echo yes`]
+ [with_java21=`echo "$javac_version" | grep -E -q '^javac\ (21)' && echo yes`]
])
AS_IF([test "x$with_java9" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.6], [java_code_version=1.4])
AS_IF([test "x$with_java12" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.7])
+ AS_IF([test "x$with_java21" = "xyes" -a "$BDJ_TYPE" != "j2me"], [java_code_version=1.8])
])
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
@@ -304,6 +312,7 @@ AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
AM_CONDITIONAL([USING_JAVAC_9], [ test x"$with_java9" = x"yes" ])
AM_CONDITIONAL([USING_JAVAC_12], [ test x"$with_java12" = x"yes" ])
+AM_CONDITIONAL([USING_JAVAC_21], [ test x"$with_java21" = x"yes" ])
dnl BD-J type
if test "$BDJ_TYPE" = "j2me"; then

33
libbluray.spec → SPECS/libbluray.spec
Unescape View File

@ -7,13 +7,14 @@
Name: libbluray
Version: 1.3.4
Release: 1%{?dist}
Release: 7%{?dist}
Summary: Library to access Blu-Ray disks for video playback
License: LGPLv2+
URL: https://www.videolan.org/developers/libbluray.html
Source0: https://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
Patch0: libbluray-0.8.0-no_doxygen_timestamp.patch
Patch1: libbluray-1.3.4-java_21.patch
BuildRequires: autoconf
BuildRequires: automake
@ -68,7 +69,8 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .no_timestamp
%patch -P0 -p1 -b .no_timestamp
%patch -P1 -p1 -b .java_21
%build
@ -78,7 +80,11 @@ export JDK_HOME="%{_jvmdir}/java"
autoreconf -vif
%configure --disable-static \
%if ! %{build_bdj}
%if %{build_bdj}
%if 0%{?fedora} >= 41
--with-java21 \
%endif
%else
--disable-bdjava-jar \
%endif
%if %{build_pdf_doc}
@ -125,6 +131,27 @@ find %{buildroot} -name '*.la' -delete
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Mon Dec 23 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.3.4-7
- Rebuilt for MSVSphere 10
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Mar 06 2024 Xavier Bachelot <xavier@bachelot.org> - 1.3.4-6
- Fix build with java 21
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 30 2022 Xavier Bachelot <xavier@bachelot.org> - 1.3.4-1
- Update to 1.3.4 (RHBZ#2149455)

1
sources
Unescape View File

@ -1 +0,0 @@
SHA512 (libbluray-1.3.4.tar.bz2) = 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
Write Preview
Loading…
Cancel
Save