[libbluray-devel] [PATCH] Fix regression in builds without bdjava caused by cbb86e18

[Ricardo Constantino]

On 2016-07-26 17:13, Ricardo Constantino (:RiCON) wrote:
> Signed-off-by: Ricardo Constantino (:RiCON) <wiiaboo at gmail.com>
> ---
>  src/libbluray/bluray.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
> index 36e9fac..226ad29 100644
> --- a/src/libbluray/bluray.c
> +++ b/src/libbluray/bluray.c
> @@ -1409,13 +1409,13 @@ BLURAY *bd_init(void)
>      bd_mutex_init(&bd->mutex);
>  #ifdef USING_BDJAVA
>      bd_mutex_init(&bd->argb_buffer_mutex);
> -#endif
>  
>      env = getenv("LIBBLURAY_PERSISTENT_STORAGE");
>      if (env) {
>          int v = (!strcmp(env, "yes")) ? 1 : (!strcmp(env, "no")) ? 0 : atoi(env);
>          bd->bdjstorage.no_persistent_storage = !v;
>      }
> +#endif
>  
>      BD_DEBUG(DBG_BLURAY, "BLURAY initialized!\n");
>  
> @@ -2775,6 +2775,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, uint32_t value)
>          bd_mutex_unlock(&bd->mutex);
>          return result;
>      }
> +#ifdef USING_BDJAVA
>      if (idx == BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE) {
>          if (bd->title_type != title_undef) {
>              BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't disable persistent storage during playback\n");
> @@ -2783,6 +2784,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, uint32_t value)
>          bd->bdjstorage.no_persistent_storage = !value;
>          return 1;
>      }
> +#endif
>  
>      for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) {
>          if (idx == map[i].idx) {
> 


August ping.


$ ../configure --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --prefix=/local64 --disable-shared --enable-static --disable-examples --disable-bdjava --disable-doxygen-doc --without-libxml2 --without-fontconfig --without-freetype
$ make 
make  all-am
make[1]: Entering directory '/build/libbluray-git/build-64bit'
  CC       src/file/dir_win32.lo
  CC       src/file/dirs_win32.lo
  CC       src/file/dl_win32.lo
  CC       src/file/file_win32.lo
  CC       src/file/mount.lo
  CC       src/libbluray/disc/udf_fs.lo
  CC       src/file/file.lo
  CC       src/file/filesystem.lo
  CC       src/libbluray/bluray.lo
  CC       src/libbluray/register.lo
../src/libbluray/bluray.c: In function 'bd_init':
../src/libbluray/bluray.c:1417:11: error: 'BLURAY {aka struct bluray}' has no member named 'bdjstorage'
         bd->bdjstorage.no_persistent_storage = !v;
           ^~
../src/libbluray/bluray.c: In function 'bd_set_player_setting':
../src/libbluray/bluray.c:2783:11: error: 'BLURAY {aka struct bluray}' has no member named 'bdjstorage'
         bd->bdjstorage.no_persistent_storage = !value;
           ^~
../src/libbluray/bluray.c: In function '_set_rate':
../src/libbluray/bluray.c:3561:43: warning: unused parameter 'rate' [-Wunused-parameter]
 static int _set_rate(BLURAY *bd, uint32_t rate)
                                           ^~~~
make[1]: *** [Makefile:1497: src/libbluray/bluray.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/build/libbluray-git/build-64bit'
make: *** [Makefile:918: all] Error 2
make  all-am
make[1]: Entering directory '/build/libbluray-git/build-64bit'
  CC       src/libbluray/bluray.lo
../src/libbluray/bluray.c: In function 'bd_init':
../src/libbluray/bluray.c:1417:11: error: 'BLURAY {aka struct bluray}' has no member named 'bdjstorage'
         bd->bdjstorage.no_persistent_storage = !v;
           ^~
../src/libbluray/bluray.c: In function 'bd_set_player_setting':
../src/libbluray/bluray.c:2783:11: error: 'BLURAY {aka struct bluray}' has no member named 'bdjstorage'
         bd->bdjstorage.no_persistent_storage = !value;
           ^~
../src/libbluray/bluray.c: In function '_set_rate':
../src/libbluray/bluray.c:3561:43: warning: unused parameter 'rate' [-Wunused-parameter]
 static int _set_rate(BLURAY *bd, uint32_t rate)
                                           ^~~~
make[1]: *** [Makefile:1497: src/libbluray/bluray.lo] Error 1
make[1]: Leaving directory '/build/libbluray-git/build-64bit'
make: *** [Makefile:918: all] Error 2