From 736ea295294427e5f07f79e1bc31871d34edbe69 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sun, 9 May 2010 23:34:57 +0000 Subject: libbz2 is not needed git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47720 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 9 ++++++++- configure | 11 ----------- configure.ac | 4 ---- debian/control | 2 +- libpcsxcore/plugins.c | 3 +-- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58581124..d6c6d8ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ +May 10, 2010 Wei Mingzhi + + * configure.ac: libbz2 is no longer needed. + * debian/control: Likewise. + * libpcsxcore/plugins.c: CDRgetBufferSub() is now mandatory. + May 9, 2010 edgbla * libpcsxcore/psxcounters.c: psxRcntFreeze was fixed. - * plugins/dfxvideo/prim.c: Returned some code (iGPUHeight=1024), IMO, it's wrong, can't perform the tests. + * plugins/dfxvideo/prim.c: Returned some code (iGPUHeight=1024), IMO, it's + wrong, can't perform the tests. May 9, 2010 Wei Mingzhi diff --git a/configure b/configure index 704a22d5..22121ada 100755 --- a/configure +++ b/configure @@ -13714,17 +13714,6 @@ fi if test "x$have_zlib" = xno; then as_fn_error "unable to find libz headers" "$LINENO" 5 fi -ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" -if test "x$ac_cv_header_bzlib_h" = x""yes; then : - have_bzlib=yes -else - have_bzlib=no -fi - - -if test "x$have_bzlib" = xno; then - as_fn_error "unable to find libbz2 headers" "$LINENO" 5 -fi ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xv.h" "ac_cv_header_X11_extensions_Xv_h" "$ac_includes_default" if test "x$ac_cv_header_X11_extensions_Xv_h" = x""yes; then : have_xv=yes diff --git a/configure.ac b/configure.ac index 23638b28..0aef9912 100644 --- a/configure.ac +++ b/configure.ac @@ -80,10 +80,6 @@ AC_CHECK_HEADER(zlib.h, have_zlib=yes, have_zlib=no) if test "x$have_zlib" = xno; then AC_MSG_ERROR([unable to find libz headers]) fi -AC_CHECK_HEADER(bzlib.h, have_bzlib=yes, have_bzlib=no) -if test "x$have_bzlib" = xno; then - AC_MSG_ERROR([unable to find libbz2 headers]) -fi AC_CHECK_HEADER(X11/extensions/Xv.h, have_xv=yes, have_xv=no) if test "x$have_xv" = xno; then AC_MSG_ERROR([unable to find xv headers]) diff --git a/debian/control b/debian/control index a8bab94b..a51254a9 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pcsxr Section: otherosfs Priority: extra Maintainer: Wei Mingzhi -Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libbz2-dev, libgl1-mesa-dev, libxxf86vm-dev, libasound2-dev, libsdl1.2-dev +Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libasound2-dev, libsdl1.2-dev Standards-Version: 3.7.3 Package: pcsxr diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 276def79..96722986 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -221,7 +221,6 @@ long CALLBACK CDR__getStatus(struct CdrStat *stat) { } char* CALLBACK CDR__getDriveLetter(void) { return NULL; } -unsigned char* CALLBACK CDR__getBufferSub(void) { return NULL; } long CALLBACK CDR__configure(void) { return 0; } long CALLBACK CDR__test(void) { return 0; } void CALLBACK CDR__about(void) {} @@ -263,7 +262,7 @@ static int LoadCDRplugin(const char *CDRdll) { LoadCdrSym0(stop, "CDRstop"); LoadCdrSym0(getStatus, "CDRgetStatus"); LoadCdrSym0(getDriveLetter, "CDRgetDriveLetter"); - LoadCdrSym0(getBufferSub, "CDRgetBufferSub"); + LoadCdrSym1(getBufferSub, "CDRgetBufferSub"); LoadCdrSym0(configure, "CDRconfigure"); LoadCdrSym0(test, "CDRtest"); LoadCdrSym0(about, "CDRabout"); -- cgit v1.2.3