OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 28-Feb-2009 22:51:41 Branch: HEAD Handle: 2009022821514100 Added files: openpkg-src/xvid xvid.patch Modified files: openpkg-src/xvid xvid.spec Log: I said 'without pthread, please' and you don't wanted to react. So, let's try the larger hammer and finally get rid of pthreads here Summary: Revision Changes Path 1.1 +53 -0 openpkg-src/xvid/xvid.patch 1.21 +2 -0 openpkg-src/xvid/xvid.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/xvid/xvid.patch ============================================================================ $ cvs diff -u -r0 -r1.1 xvid.patch --- /dev/null 2009-02-28 22:51:28 +0100 +++ xvid.patch 2009-02-28 22:51:41 +0100 @@ -0,0 +1,53 @@ +Index: src/encoder.c +--- src/encoder.c.orig 2007-02-08 14:10:24 +0100 ++++ src/encoder.c 2009-02-28 22:47:19 +0100 +@@ -1712,6 +1712,7 @@ + } + + ++#if 0 + if (pEnc->num_threads > 0) { + /* multithreaded motion estimation - dispatch threads */ + +@@ -1753,12 +1754,15 @@ + } + + } else { ++#endif + /* regular ME */ + + MotionEstimation(&pEnc->mbParam, current, reference, + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, + &pEnc->vGMC, 256*4096); ++#if 0 + } ++#endif + + stop_motion_timer(); + +@@ -2008,6 +2012,7 @@ + frame->fcode = frame->bcode = pEnc->current->fcode; + + start_timer(); ++#if 0 + if (pEnc->num_threads > 0) { + void * status; + int k; +@@ -2054,6 +2059,7 @@ + frame->bcode = pEnc->motionData[k].minbcode; + } + } else { ++#endif + MotionEstimationBVOP(&pEnc->mbParam, frame, + ((int32_t)(pEnc->current->stamp - frame->stamp)), /* time_bp */ + ((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), /* time_pp */ +@@ -2061,7 +2067,9 @@ + &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, + pEnc->current, b_ref, &pEnc->vInterH, + &pEnc->vInterV, &pEnc->vInterHV); ++#if 0 + } ++#endif + stop_motion_timer(); + + set_timecodes(frame, pEnc->reference,pEnc->mbParam.fbase); @@ . patch -p0 <<'@@ .' Index: openpkg-src/xvid/xvid.spec ============================================================================ $ cvs diff -u -r1.20 -r1.21 xvid.spec --- openpkg-src/xvid/xvid.spec 28 Feb 2009 21:38:36 -0000 1.20 +++ openpkg-src/xvid/xvid.spec 28 Feb 2009 21:51:41 -0000 1.21 @@ -39,6 +39,7 @@ # list of sources Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2 +Patch0: xvid.patch # build information Prefix: %{l_prefix} @@ -64,6 +65,7 @@ %prep %setup -q -n xvidcore + %patch -p0 %build ( cd build/generic @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
