Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a6d547ea9cf30e8a97bb4358de56998e8c0d3e70)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a6d547ea9cf30e8a97bb4358de56998e8c0d3e70)
  • Date: Mon, 28 Apr 2008 08:55:00 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3
graphics/topmod/64bit.patch | 82 ++++++++++++++++++
graphics/topmod/BUILD | 16 +++
graphics/topmod/DEPENDS | 3
graphics/topmod/DETAILS | 32 +++++++
graphics/topmod/HISTORY | 4
graphics/topmod/INSTALL | 6 +
graphics/topmod/PREPARE | 1
graphics/topmod/PRE_BUILD | 2
video/cinelerra/DETAILS | 5 -
video/cinelerra/HISTORY | 8 +
video/cinelerra/PRE_BUILD | 13 +-
video/cinelerra/gcc-4.3.patch | 64 ++++++++++++++
video/cinelerra/gcc41.patch | 132
-----------------------------
video/cinelerra/jpeg-mmx-0.1.6-gcc41.patch | 12 --
video/cinelerra/libdv-0.103-mmx.patch | 33 -------
16 files changed, 230 insertions(+), 186 deletions(-)

New commits:
commit a6d547ea9cf30e8a97bb4358de56998e8c0d3e70
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

topmod: fixed the source url fix attempt :)

commit def1e35e10b521c2aa9ed698bf2ca9248a56558a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

topmod changelog entry

commit 38367d9cfc476c4646d87465b17d8a4ea00e5f8e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cinelerra: 2.1 (ugh!)

commit d8df31fc90aec38b6ad2a2df125d5ab819fb59e6
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

topmod: a cool topological mesh modelling app

diff --git a/ChangeLog b/ChangeLog
index 2ffa768..ffb0ccc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * graphics/topmod: a topological mesh modeling system
+
2008-04-28 Ladislav Hagara <hgr AT vabo.cz>
* video-libs/revel: new spell, Really Easy Video Encoding Library
* video/wxcam: new spell, a webcam application
diff --git a/graphics/topmod/64bit.patch b/graphics/topmod/64bit.patch
new file mode 100644
index 0000000..101d797
--- /dev/null
+++ b/graphics/topmod/64bit.patch
@@ -0,0 +1,82 @@
+diff -ur topmodx_original/include/dlflcore/DLFLCommon.hh
topmodx/include/dlflcore/DLFLCommon.hh
+--- topmodx_original/include/dlflcore/DLFLCommon.hh 2008-04-10
15:22:15.000000000 +0100
++++ topmodx/include/dlflcore/DLFLCommon.hh 2008-04-10 19:35:02.000000000
+0100
+@@ -238,7 +238,7 @@
+ };
+
+ typedef __gnu_cxx::hash<unsigned int> Hash;
+- typedef __gnu_cxx::hash_map<unsigned int, unsigned int, Hash, eqstr>
HashMap;
++ typedef __gnu_cxx::hash_map<unsigned long, unsigned long, Hash, eqstr>
HashMap;
+
+ } // end namespace
+
+diff -ur topmodx_original/include/dlflcore/DLFLFaceVertex.hh
topmodx/include/dlflcore/DLFLFaceVertex.hh
+--- topmodx_original/include/dlflcore/DLFLFaceVertex.hh 2008-04-10
15:22:15.000000000 +0100
++++ topmodx/include/dlflcore/DLFLFaceVertex.hh 2008-04-10 19:35:02.000000000
+0100
+@@ -94,7 +94,7 @@
+ void assignID( ) {
+ // uID = DLFLFaceVertex::newID();
+ //std::cout << this;
+- uID = (unsigned int) this;
++ uID = (unsigned long) this;
+ //std::cout << "->" << uID << std::endl;
+ };
+
+diff -ur topmodx_original/include/dlflcore/DLFLObject.hh
topmodx/include/dlflcore/DLFLObject.hh
+--- topmodx_original/include/dlflcore/DLFLObject.hh 2008-04-10
15:22:15.000000000 +0100
++++ topmodx/include/dlflcore/DLFLObject.hh 2008-04-10 19:35:02.000000000
+0100
+@@ -359,7 +359,7 @@
+ while ( efirst != elast ) {
+ edgeMap.erase((*efirst)->getID());
+ (*efirst)->makeUnique();
+- edgeMap[(*efirst)->getID()] = (unsigned int)(*efirst);
++ edgeMap[(*efirst)->getID()] = (unsigned
long)(*efirst);
+ ++efirst;
+ }
+ }
+@@ -370,7 +370,7 @@
+ while ( ffirst != flast ) {
+ faceMap.erase((*ffirst)->getID());
+ (*ffirst)->makeUnique();
+- faceMap[(*ffirst)->getID()] = (unsigned int)(*ffirst);
++ faceMap[(*ffirst)->getID()] = (unsigned
long)(*ffirst);
+ ++ffirst;
+ }
+ };
+@@ -414,7 +414,7 @@
+ // Insert the pointer.
+ // **** WARNING!!! **** Pointer will be freed when list is deleted
+ edge_list.push_back(edgeptr);
+- edgeMap[edgeptr->getID()] = (unsigned int)edgeptr;
++ edgeMap[edgeptr->getID()] = (unsigned long)edgeptr;
+ };
+
+ void addFace(const DLFLFace& face); // Insert a copy
+@@ -426,7 +426,7 @@
+ // If Face doesn't have a material assigned to it, assign the default
material
+ faceptr->setMaterial(matl_list.front());
+ face_list.push_back(faceptr);
+- faceMap[faceptr->getID()] = (unsigned int)faceptr;
++ faceMap[faceptr->getID()] = (unsigned long)faceptr;
+ };
+
+ DLFLVertexPtr getVertexPtr(uint index) const {
+@@ -530,14 +530,14 @@
+ void boundaryWalk(uint face_index);
+ void vertexTrace(uint vertex_index);
+
+- void readObject( istream& i, istream &imtl = NULL );
++ void readObject( istream& i, istream &imtl = *static_cast< istream* >(
NULL ) );
+ void readObjectAlt( istream& i );
+- void readDLFL( istream& i, istream &imtl = NULL, bool clearold = true );
++ void readDLFL( istream& i, istream &imtl = *static_cast< istream* >( NULL
), bool clearold = true );
+ bool readMTL( istream &i);
+ bool writeMTL( ostream& o );
+
+- void writeObject( ostream& o, ostream &omtl = NULL, bool with_normals =
true, bool with_tex_coords = true );
+- void writeDLFL(ostream& o, ostream &omtl = NULL, bool reverse_faces =
false);
++ void writeObject( ostream& o, ostream &omtl = *static_cast< ostream* >(
NULL ), bool with_normals = true, bool with_tex_coords = true );
++ void writeDLFL(ostream& o, ostream &omtl = *static_cast< ostream* >( NULL
), bool reverse_faces = false);
+ void writeSTL(ostream& o);
+ void writeLG3d(ostream& o, bool select = false); //!< added by dave - for
LiveGraphics3D support to embed 3d models into html
+ inline void setFilename( const char *filename ) {
diff --git a/graphics/topmod/BUILD b/graphics/topmod/BUILD
new file mode 100755
index 0000000..b548f87
--- /dev/null
+++ b/graphics/topmod/BUILD
@@ -0,0 +1,16 @@
+if [[ -z $QTDIR ]]; then
+ source /etc/profile.d/qt.sh
+fi &&
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+
+# missing image and i18n
+touch images/color-fill.png &&
+touch lang/topmod_es.qm lang/topmod_fr.qm &&
+
+cd include &&
+qmake &&
+make &&
+cd .. &&
+qmake &&
+make
diff --git a/graphics/topmod/DEPENDS b/graphics/topmod/DEPENDS
new file mode 100755
index 0000000..5951981
--- /dev/null
+++ b/graphics/topmod/DEPENDS
@@ -0,0 +1,3 @@
+depends qt4 &&
+depends python &&
+depends subversion
diff --git a/graphics/topmod/DETAILS b/graphics/topmod/DETAILS
new file mode 100755
index 0000000..b8d6be3
--- /dev/null
+++ b/graphics/topmod/DETAILS
@@ -0,0 +1,32 @@
+ SPELL=topmod
+if [[ $TOPMOD_AUTOUPDATE == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_URL[0]=svn_http://${SPELL}.googlecode.com/svn/trunk:topmod-svn
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn/topmodx"
+ WEB_SITE="http://www.topmod3d.org";
+ FORCE_DOWNLOAD=on
+ LICENSE[0]=GPLv2
+ ENTERED=20080428
+ SHORT="a topological mesh modeling system for creating high genus
2-manifold meshes"
+cat << EOF
+TopMod is based on a new paradigm that allows dynamically changing the
+topology of 2-manifold polygonal meshes. The new paradigm always guarantees
+topological consistency of polygonal meshes.
+
+Based on our paradigm, by simply adding and deleting edges,handles can be
+created and deleted, holes can be opened or closed, polygonal meshes can be
+connected or disconnected. These edge insertion and edge deletion operations
+are highly consistent with subdivision algorithms. In particular, these
+operations can easily be included into a subdivision modeling system such
+that the topological changes and subdivision operations can be performed
+alternatively during model construction.
+
+TopMod demonstrates practical examples of topology changes based on this new
+paradigm and show that the new paradigm is convenient, effective, efficient,
+and friendly to subdivision surfaces.
+EOF
diff --git a/graphics/topmod/HISTORY b/graphics/topmod/HISTORY
new file mode 100644
index 0000000..188ca90
--- /dev/null
+++ b/graphics/topmod/HISTORY
@@ -0,0 +1,4 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS, DETAILS, BUILD, INSTALL, PRE_BUILD, PREPARE: spell created
+ * 64.bit.patch: initial unbreaking patch from Arch
+
diff --git a/graphics/topmod/INSTALL b/graphics/topmod/INSTALL
new file mode 100755
index 0000000..86dc463
--- /dev/null
+++ b/graphics/topmod/INSTALL
@@ -0,0 +1,6 @@
+find . -type d -name .svn | xargs rm -rf &&
+
+install -D -m755 TopMod "$INSTALL_ROOT"/usr/bin/TopMod &&
+install -D -m644 images/topmod.png
"$INSTALL_ROOT"/usr/share/pixmaps/topmod.png &&
+mkdir -p "$INSTALL_ROOT"/usr/share/topmod &&
+cp -r video "$INSTALL_ROOT"/usr/share/topmod
diff --git a/graphics/topmod/PREPARE b/graphics/topmod/PREPARE
new file mode 100755
index 0000000..e00119e
--- /dev/null
+++ b/graphics/topmod/PREPARE
@@ -0,0 +1 @@
+config_query TOPMOD_AUTOUPDATE "Auto-update $SPELL on every system-update?"
n
diff --git a/graphics/topmod/PRE_BUILD b/graphics/topmod/PRE_BUILD
new file mode 100755
index 0000000..8fc9104
--- /dev/null
+++ b/graphics/topmod/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SCRIPT_DIRECTORY/64bit.patch
diff --git a/video/cinelerra/DETAILS b/video/cinelerra/DETAILS
index 9d223b7..dffdcdd 100755
--- a/video/cinelerra/DETAILS
+++ b/video/cinelerra/DETAILS
@@ -1,12 +1,11 @@
SPELL=cinelerra
- VERSION=2.0
+ VERSION=2.1
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/heroines/$SOURCE
-
SOURCE_HASH=sha512:3a8ec2edb0c2925a77224984e837ea08419756c551fa35b7411b11c22b00c549cc085dcc0b9a3ce9d2a0bffd987aaaf13f71cdf1d6f17b1fc35d5b3d43656cbc
+
SOURCE_HASH=sha512:0d4cfa19c7af3329f4cd5b56cfd018207144a555392ca16686d6eea1474c58c5e4fa9017f20276c78c8e7be8dc3f72e82b031789daddcc399fbdb8292cb3a059
WEB_SITE=http://heroinewarrior.com
ENTERED=20020707
- UPDATED=20020813
LICENSE[0]=GPL
KEYWORDS="video"
SHORT="Advanced compositing and editing for native Linux"
diff --git a/video/cinelerra/HISTORY b/video/cinelerra/HISTORY
index 44f8370..f8865ad 100644
--- a/video/cinelerra/HISTORY
+++ b/video/cinelerra/HISTORY
@@ -1,3 +1,11 @@
+2008-04-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: changed patching and added some curative sedits
+ * gcc-4.3.patch: added to make it build
+ * {gcc41,jpeg-mmx-0.1.6-gcc41,libdv-0.103-mmx}.patch: deleted -
included
+
+2008-04-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated spell to 2.1
+
2006-06-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, make-compat.patch: fix build system to work with
make 3.81, bug #12607
diff --git a/video/cinelerra/PRE_BUILD b/video/cinelerra/PRE_BUILD
index 9380593..a5335e9 100755
--- a/video/cinelerra/PRE_BUILD
+++ b/video/cinelerra/PRE_BUILD
@@ -2,14 +2,15 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
# fixes bug #10772
sedit 's:CFLAGS=-fPIC ./configure:\0 --disable-fortran:' configure &&
-patch -p0 < $SCRIPT_DIRECTORY/gcc41.patch &&
-patch -d quicktime/jpeg-mmx.0.1.6 -p1 < \
- $SCRIPT_DIRECTORY/jpeg-mmx-0.1.6-gcc41.patch &&
-patch -d quicktime/libdv-0.104 -p1 < \
- $SCRIPT_DIRECTORY/libdv-0.103-mmx.patch &&
#patch -p1 < $SCRIPT_DIRECTORY/cinelerra-2.0-shared.patch
+patch -p0 < $SCRIPT_DIRECTORY/gcc-4.3.patch
# remove unnecessary stuff from ffplay so it works with sdl 1.2.10
-sedit 's/#define HAVE_X11/#undef HAVE_X11/'
quicktime/ffmpeg.071405/ffplay.c &&
+sedit 's/#define HAVE_X11/#undef HAVE_X11/' quicktime/ffmpeg.*/ffplay.c &&
+# avoid dereferencing an incomplete type
+sed -i 's/fileno((.*$/lqt_fileno((quicktime_t *)lav_file->qt_fd);/' \
+ mjpegtools-*/lavtools/lav_io.c &&
+# a broken plugin
+sed -i '/y4mdenoise/d' mjpegtools-1.6.3-rc1/Makefile* &&
if make -v | grep -q 3.81; then
# fix build system to work with make 3.81
patch -p0 < $SCRIPT_DIRECTORY/make-compat.patch
diff --git a/video/cinelerra/gcc-4.3.patch b/video/cinelerra/gcc-4.3.patch
new file mode 100644
index 0000000..c1c834c
--- /dev/null
+++ b/video/cinelerra/gcc-4.3.patch
@@ -0,0 +1,64 @@
+--- mjpegtools-1.6.3-rc1/mplex/inputstrm.cpp.orig 2008-04-28
09:32:46.000000000 +0200
++++ mjpegtools-1.6.3-rc1/mplex/inputstrm.cpp 2008-04-28
09:33:00.000000000 +0200
+@@ -23,6 +23,7 @@
+
+ #include <config.h>
+ #include <assert.h>
++#include <climits>
+
+ #include "mjpeg_types.h"
+ #include "inputstrm.hpp"
+--- /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mplex/multiplexor.cpp.orig
2008-04-28 09:36:17.000000000 +0200
++++ /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mplex/multiplexor.cpp
2008-04-28 09:39:09.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include <config.h>
+ #include <math.h>
+ #include <stdlib.h>
++#include <cstring>
+
+ #include <mjpeg_types.h>
+ #include <mjpeg_logging.h>
+--- /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mplex/padstrm.cpp.orig
2008-04-28 09:40:17.000000000 +0200
++++ /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mplex/padstrm.cpp
2008-04-28 09:40:31.000000000 +0200
+@@ -23,7 +23,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+-
++#include <cstring>
+ #include "padstrm.hpp"
+
+
+--- /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mplex/main.cpp.orig
2008-04-28 09:41:22.000000000 +0200
++++ /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mplex/main.cpp 2008-04-28
10:15:45.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <getopt.h>
+ #endif
+ #include <string>
++#include <cstring>
+ #include <memory>
+ #include <sys/stat.h>
+ #ifndef _WIN32
+--- /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mpeg2enc/encodertypes.h.orig
2008-04-28 11:07:10.000000000 +0200
++++ /usr/src/cinelerra-2.1/mjpegtools-1.6.3-rc1/mpeg2enc/encodertypes.h
2008-04-28 11:09:06.000000000 +0200
+@@ -25,7 +25,8 @@
+
+
+ #include "config.h"
+-
++#include <cstdlib>
++#include <climits>
+
+
+ class Parity
+--- /usr/src/cinelerra-2.1/cinelerra/playback3d.h.orig 2008-04-28
15:27:03.000000000 +0200
++++ /usr/src/cinelerra-2.1/cinelerra/playback3d.h 2008-04-28
15:27:29.000000000 +0200
+@@ -225,7 +225,7 @@
+ // output - passed when rendering refresh frame. If 0, the canvas is
cleared.
+ void clear_output(Canvas *canvas, VFrame *output);
+
+- void do_fade(Canvas *canvas, VFrame *fade, float fade);
++ void do_fade(Canvas *canvas, VFrame *frame, float fade);
+
+ void do_mask(Canvas *canvas,
+ VFrame *output,
diff --git a/video/cinelerra/gcc41.patch b/video/cinelerra/gcc41.patch
deleted file mode 100644
index 7915eaf..0000000
--- a/video/cinelerra/gcc41.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- ./guicast/bclistbox.h~ 2005-07-06 22:44:03.000000000 +0200
-+++ ./guicast/bclistbox.h 2006-03-28 17:20:51.000000000 +0200
-@@ -351,7 +351,7 @@
-
- int get_title_h();
- int calculate_item_coords();
-- void BC_ListBox::calculate_last_coords_recursive(
-+ void calculate_last_coords_recursive(
- ArrayList<BC_ListBoxItem*> *data,
- int *icon_x,
- int *next_icon_x,
---- ./guicast/bcpopupmenu.h~ 2005-09-07 23:25:13.000000000 +0200
-+++ ./guicast/bcpopupmenu.h 2006-03-28 17:23:44.000000000 +0200
-@@ -2,7 +2,7 @@
- #define BCPOPUPMENU_H
-
- #include "bcmenubar.inc"
--#include "bcmenuitem.inc"
-+#include "bcmenuitem.h"
- #include "bcsubwindow.h"
-
-
---- ./guicast/bcfilebox.h~ 2005-07-06 22:18:05.000000000 +0200
-+++ ./guicast/bcfilebox.h 2006-03-28 17:21:47.000000000 +0200
-@@ -6,7 +6,7 @@
- #include "bcfilebox.inc"
- #include "bclistbox.inc"
- #include "bclistboxitem.inc"
--#include "bcnewfolder.inc"
-+#include "bcnewfolder.h"
- #include "bcresources.inc"
- #include "bctextbox.h"
- #include "bcwindow.h"
---- ./plugins/burn/burn.h~ 2005-04-20 22:15:22.000000000 +0200
-+++ ./plugins/burn/burn.h 2006-03-28 20:02:29.000000000 +0200
-@@ -75,7 +75,7 @@
-
-
-
-- void BurnMain::HSItoRGB(double H,
-+ void HSItoRGB(double H,
- double S,
- double I,
- int *r,
---- ./cinelerra/virtualconsole.h~ 2005-04-20 22:15:17.000000000 +0200
-+++ ./cinelerra/virtualconsole.h 2006-03-28 20:06:25.000000000 +0200
-@@ -28,7 +28,7 @@
-
- // Called during each process buffer operation to reset the status
- // of the attachments to unprocessed.
-- void VirtualConsole::reset_attachments();
-+ void reset_attachments();
- void dump();
-
-
---- ./cinelerra/renderfarmclient.h~ 2005-06-27 20:44:29.000000000 +0200
-+++ ./cinelerra/renderfarmclient.h 2006-03-28 20:18:18.000000000 +0200
-@@ -70,7 +70,7 @@
-
-
-
-- void RenderFarmClientThread::read_preferences(int socket_fd,
-+ void read_preferences(int socket_fd,
- Preferences *preferences);
- void read_asset(int socket_fd, Asset *asset);
- void read_edl(int socket_fd,
---- ./cinelerra/vrender.h~ 2005-04-20 22:15:17.000000000 +0200
-+++ ./cinelerra/vrender.h 2006-03-28 20:21:20.000000000 +0200
-@@ -48,7 +48,7 @@
- // Flash the output on the display
- int flash_output();
- // Determine if data can be copied directly from the file to the output
device.
-- void VRender::get_render_strategy(Edit* &playable_edit,
-+ void get_render_strategy(Edit* &playable_edit,
- int &colormodel,
- int &use_vconsole,
- int64_t position);
---- ./cinelerra/framecache.h~ 2005-04-20 22:15:17.000000000 +0200
-+++ ./cinelerra/framecache.h 2006-03-28 20:14:58.000000000 +0200
-@@ -73,7 +73,7 @@
- int64_t position,
- double frame_rate,
- int *item_return);
-- int FrameCache::frame_exists(int64_t position,
-+ int frame_exists(int64_t position,
- double frame_rate,
- int color_model,
- int w,
---- ./cinelerra/zoombar.h~ 2005-07-07 02:49:25.000000000 +0200
-+++ ./cinelerra/zoombar.h 2006-03-28 20:13:01.000000000 +0200
-@@ -24,7 +24,7 @@
- ~ZoomBar();
-
- int create_objects();
-- void ZoomBar::resize_event();
-+ void resize_event();
- int draw();
- int resize_event(int w, int h);
- void redraw_time_dependancies();
---- ./cinelerra/file.h~ 2005-04-20 22:15:17.000000000 +0200
-+++ ./cinelerra/file.h 2006-03-28 20:04:15.000000000 +0200
-@@ -140,7 +140,7 @@
-
-
- // Read frame of video into the argument
-- int File::read_frame(VFrame *frame);
-+ int read_frame(VFrame *frame);
-
-
- // The following involve no extra copies.
---- ./mpeg2enc/mblock_sub44_sads.c~ 2006-03-28 20:23:15.000000000 +0200
-+++ ./mpeg2enc/mblock_sub44_sads.c 2006-03-28 20:23:19.000000000 +0200
-@@ -61,7 +61,7 @@
- *
- */
-
--static __inline__ void load_blk(uint8_t *blk, uint32_t rowstride, int h)
-+static void load_blk(uint8_t *blk, uint32_t rowstride, int h)
- {
- // Required to get GCC 4.0 to use the right registers as the source
argument to
- // movq
---- ./mpeg2enc/quantize_x86.c~ 2005-08-08 01:49:51.000000000 +0200
-+++ ./mpeg2enc/quantize_x86.c 2006-03-28 20:24:20.000000000 +0200
-@@ -234,7 +234,7 @@
- "movd %%eax, %%mm6\n"
- : :"g" (1) : "eax" );
- /* Set up SSE rounding mode */
-- __asm__ ( "ldmxcsr %0\n" : : "X" (trunc_mxcsr) );
-+ __asm__ ( "ldmxcsr %0\n" : : "m" (trunc_mxcsr) );
-
- /* Load satlim into mm1 */
- movd_m2r( satlim, mm1 );
diff --git a/video/cinelerra/jpeg-mmx-0.1.6-gcc41.patch
b/video/cinelerra/jpeg-mmx-0.1.6-gcc41.patch
deleted file mode 100644
index 1ae80c1..0000000
--- a/video/cinelerra/jpeg-mmx-0.1.6-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur jpeg-mmx-orig/jquant_x86simd.c jpeg-mmx/jquant_x86simd.c
---- jpeg-mmx-orig/jquant_x86simd.c 2006-01-22 21:37:14.000000000 -0600
-+++ jpeg-mmx/jquant_x86simd.c 2006-01-22 21:37:43.000000000 -0600
-@@ -104,7 +104,7 @@
-
- /* Initialise zero block flags */
- /* Set up SSE rounding mode */
-- __asm__ ( "ldmxcsr %0\n" : : "X" (trunc_mxcsr) );
-+ __asm__ ( "ldmxcsr %0\n" : : "m" (trunc_mxcsr) );
-
- for (i=0; i < 64 ; i+=4)
- {
diff --git a/video/cinelerra/libdv-0.103-mmx.patch
b/video/cinelerra/libdv-0.103-mmx.patch
deleted file mode 100644
index 09a688d..0000000
--- a/video/cinelerra/libdv-0.103-mmx.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libdv-0.103/libdv/mmx.h.mmx 2006-02-13 16:43:45.000000000 -0500
-+++ libdv-0.103/libdv/mmx.h 2006-02-13 16:43:57.000000000 -0500
-@@ -353,16 +353,16 @@
- #define mmx_i2r(op, imm, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (imm) )
-+ : "i" (imm) )
-
- #define mmx_m2r(op, mem, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (mem))
-+ : "m" (mem))
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
-@@ -372,8 +372,8 @@
- __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- #op " %1, %%mm0\n\t" \
- "movq %%mm0, %0" \
-- : "=X" (memd) \
-- : "X" (mems))
-+ : "=m" (memd) \
-+ : "m" (mems))
-
- #endif
-



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (a6d547ea9cf30e8a97bb4358de56998e8c0d3e70), Jaka Kranjc, 04/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page