Skip to content

Commit

Permalink
[DVD] rollback libdvdnav and libdvdread to 5.03
Browse files Browse the repository at this point in the history
  • Loading branch information
atvcaptain committed Sep 18, 2022
1 parent 4a1f828 commit 007f2ac
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 35 deletions.
2 changes: 2 additions & 0 deletions meta-oe/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ PREFERRED_VERSION_libsdl2:mipsel = "2.0.8"
PREFERRED_VERSION_libsdl2:mips = "2.0.8"
PREFERRED_VERSION_nfs-utils = "2.5.3"
PREFERRED_VERSION_usb-dvb-dvbsky = "141106"
PREFERRED_VERSION_libdvdnav = "5.0.3"
PREFERRED_VERSION_libdvdread = "5.0.3"

# to Build Kodi 20 remove next line
PREFERRED_VERSION_stb-kodi-${MACHINE} = "19.4-gitrAUTOINC+e12e66e019"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
diff --git a/a52_dec.c b/a52_dec.c
index 36b4e87..dae23c0 100644
--- a/a52_dec.c
+++ b/a52_dec.c
@@ -36,6 +36,17 @@

#include "a52dec.h"

+// liba52 function defs for using dlsym
+a52_state_t * (*a52_init) (uint32_t);
+sample_t * (*a52_samples) (a52_state_t *);
+int (*a52_syncinfo) (uint8_t * , int * , int * , int * );
Expand All @@ -14,32 +17,27 @@
+void *a52_handle;
+
+a52_state_t * state;
+

// try to dynamically load and wrap liba52.so.0

diff --git a/a52dec.h b/a52dec.h
index 2cce61c..781d6c5 100644
--- a/a52dec.h
+++ b/a52dec.h
@@ -50,16 +50,16 @@ typedef struct a52_state_s a52_state_t;
@@ -49,17 +49,7 @@ typedef struct a52_state_s a52_state_t;
#define A52_LFE 16
#define A52_ADJUST_LEVEL 32

// liba52 function defs for using dlsym
-// liba52 function defs for using dlsym
-a52_state_t * (*a52_init) (uint32_t);
-sample_t * (*a52_samples) (a52_state_t *);
-int (*a52_syncinfo) (uint8_t * , int * , int * , int * );
-int (*a52_frame) (a52_state_t * , uint8_t * , int * , level_t * , sample_t );
-int (*a52_block) (a52_state_t * );
-void (*a52_free) (a52_state_t * );
+extern a52_state_t * (*a52_init) (uint32_t);
+extern sample_t * (*a52_samples) (a52_state_t *);
+extern int (*a52_syncinfo) (uint8_t * , int * , int * , int * );
+extern int (*a52_frame) (a52_state_t * , uint8_t * , int * , level_t * , sample_t );
+extern int (*a52_block) (a52_state_t * );
+extern void (*a52_free) (a52_state_t * );

-
-void *a52_handle;
+extern void *a52_handle;

-
-a52_state_t * state;
+extern a52_state_t * state;

Expand Down
2 changes: 1 addition & 1 deletion meta-oe/recipes-multimedia/libdreamdvd/libdreamdvd_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PV = "1.0+git${SRCPV}"
PKGV = "1.0+git${GITPKGV}"

SRC_URI = "git://github.com/mirakels/libdreamdvd.git;protocol=https \
file://fix-build-with-fno-common.patch"
file://move-function-pointer-away-from-header.patch"

SRC_URI:append:sh4 = "\
file://libdreamdvd-1.0-support_sh4.patch;patch=1 \
Expand Down
12 changes: 0 additions & 12 deletions meta-oe/recipes-multimedia/libdvdnav/libdvdnav.bb

This file was deleted.

14 changes: 14 additions & 0 deletions meta-oe/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
SUMMARY = "library for DVD navigation features"
SECTION = "libs/multimedia"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libdvdread"

SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.bz2"
SRC_URI[md5sum] = "e9ea4de3bd8f204e61301d407d09f033"
SRC_URI[sha256sum] = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"

inherit autotools lib_package binconfig pkgconfig

CONFIGUREOPTS:remove = "--disable-silent-rules"

10 changes: 0 additions & 10 deletions meta-oe/recipes-multimedia/libdvdread/libdvdread.bb

This file was deleted.

13 changes: 13 additions & 0 deletions meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
SUMMARY = "DVD access multimeda library"
SECTION = "libs/multimedia"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27"
SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2"

SRC_URI[md5sum] = "b7b7d2a782087ed2a913263087083715"
SRC_URI[sha256sum] = "321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b"

inherit autotools lib_package binconfig pkgconfig

CONFIGUREOPTS:remove = "--disable-silent-rules"

3 comments on commit 007f2ac

@persianpros
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to let you know you could use https://github.com/OpenVisionE2/cdfs instead of old tar.bz2 with lots of patches 👍

@jbleyel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to let you know you could use https://github.com/OpenVisionE2/cdfs instead of old tar.bz2 with lots of patches 👍

???

cdfs and libdvdxxx are complete different things.

@persianpros
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbleyel

I know, I just wanted to let you know guys that you can use the git repo for cdfs that's all.

Please sign in to comment.