xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libbz2 is not needed 

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47720 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\weimingzhi_cp 2010-05-09 23:34:57 +00:00
parent 70ab51af66
commit 736ea29529
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,7 +1,14 @@
May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* configure.ac: libbz2 is no longer needed.
* debian/control: Likewise.
* libpcsxcore/plugins.c: CDRgetBufferSub() is now mandatory.
May 9, 2010 edgbla <edgbla@yandex.ru>
* 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 <whistler_wmz@users.sf.net>

11
configure vendored
View File

@ -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

4
configure.ac
View File

@ -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])

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: pcsxr
Section: otherosfs
Priority: extra
Maintainer: Wei Mingzhi <whistler@openoffice.org>
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

3
libpcsxcore/plugins.c
View File

@ -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");