hornetseye-xorg 0.7.0 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +3 -3
- data/ext/init.cc +3 -0
- data/ext/xvideoimagepainter.cc +9 -9
- data/ext/xvideoimagepainter.hh +4 -0
- metadata +29 -3
data/Rakefile
CHANGED
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
|
|
7
7
|
require 'rbconfig'
|
8
8
|
|
9
9
|
PKG_NAME = 'hornetseye-xorg'
|
10
|
-
PKG_VERSION = '0.7.
|
10
|
+
PKG_VERSION = '0.7.1'
|
11
11
|
CFG = RbConfig::CONFIG
|
12
12
|
CXX = ENV[ 'CXX' ] || 'g++'
|
13
13
|
RB_FILES = FileList[ 'lib/**/*.rb' ]
|
@@ -46,7 +46,7 @@ desc 'Compile Ruby extension (default)'
|
|
46
46
|
task :all => [ SO_FILE ]
|
47
47
|
|
48
48
|
file SO_FILE => OBJ do |t|
|
49
|
-
sh "#{CXX} -shared -o #{t.name} #{OBJ} -lswscale -lGLU -lGL -lX11 -lXv -lXpm #{$LIBRUBYARG}"
|
49
|
+
sh "#{CXX} -shared -o #{t.name} #{OBJ} -lswscale -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXv -lXpm #{$LIBRUBYARG}"
|
50
50
|
end
|
51
51
|
|
52
52
|
task :test => [ SO_FILE ]
|
@@ -80,7 +80,7 @@ def check_program
|
|
80
80
|
f_base_name = 'rakeconf'
|
81
81
|
begin
|
82
82
|
File.open( "#{f_base_name}.cc", 'w' ) { |f| yield f }
|
83
|
-
`#{CXX}
|
83
|
+
`#{CXX} #{$CXXFLAGS} -c -o #{f_base_name}.o #{f_base_name}.cc 2>&1 >> rake.log`
|
84
84
|
$?.exitstatus == 0
|
85
85
|
ensure
|
86
86
|
File.delete *Dir.glob( "#{f_base_name}.*" )
|
data/ext/init.cc
CHANGED
@@ -13,6 +13,9 @@
|
|
13
13
|
|
14
14
|
You should have received a copy of the GNU General Public License
|
15
15
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
16
|
+
#ifdef HAVE_CONFIG_H
|
17
|
+
#include "config.h"
|
18
|
+
#endif
|
16
19
|
#include "rubyinc.hh"
|
17
20
|
#include "x11output.hh"
|
18
21
|
#include "ximagepainter.hh"
|
data/ext/xvideoimagepainter.cc
CHANGED
@@ -358,17 +358,17 @@ Atom XVideoImagePainter::findAtom( const char *name ) throw (Error)
|
|
358
358
|
assert( m_port != 0 );
|
359
359
|
XvAttribute *attributes;
|
360
360
|
int numAttributes;
|
361
|
+
Atom retVal = None;
|
361
362
|
attributes = XvQueryPortAttributes( m_display->get(), m_port,
|
362
363
|
&numAttributes );
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
XFree( attributes );
|
364
|
+
if (attributes != NULL) {
|
365
|
+
for ( int i=0; i<numAttributes; i++ )
|
366
|
+
if ( strcmp( attributes[i].name, name ) == 0 ) {
|
367
|
+
retVal = XInternAtom( m_display->get(), name, False );
|
368
|
+
break;
|
369
|
+
}
|
370
|
+
XFree( attributes );
|
371
|
+
}
|
372
372
|
return retVal;
|
373
373
|
}
|
374
374
|
|
data/ext/xvideoimagepainter.hh
CHANGED
metadata
CHANGED
@@ -1,8 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hornetseye-xorg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
+
hash: 1
|
4
5
|
prerelease:
|
5
|
-
|
6
|
+
segments:
|
7
|
+
- 0
|
8
|
+
- 7
|
9
|
+
- 1
|
10
|
+
version: 0.7.1
|
6
11
|
platform: ruby
|
7
12
|
authors:
|
8
13
|
- Jan Wedekind
|
@@ -10,7 +15,7 @@ autorequire:
|
|
10
15
|
bindir: bin
|
11
16
|
cert_chain: []
|
12
17
|
|
13
|
-
date:
|
18
|
+
date: 2012-05-27 00:00:00 Z
|
14
19
|
dependencies:
|
15
20
|
- !ruby/object:Gem::Dependency
|
16
21
|
name: malloc
|
@@ -20,6 +25,10 @@ dependencies:
|
|
20
25
|
requirements:
|
21
26
|
- - ~>
|
22
27
|
- !ruby/object:Gem::Version
|
28
|
+
hash: 13
|
29
|
+
segments:
|
30
|
+
- 1
|
31
|
+
- 1
|
23
32
|
version: "1.1"
|
24
33
|
type: :runtime
|
25
34
|
version_requirements: *id001
|
@@ -31,6 +40,10 @@ dependencies:
|
|
31
40
|
requirements:
|
32
41
|
- - ~>
|
33
42
|
- !ruby/object:Gem::Version
|
43
|
+
hash: 37
|
44
|
+
segments:
|
45
|
+
- 0
|
46
|
+
- 23
|
34
47
|
version: "0.23"
|
35
48
|
type: :runtime
|
36
49
|
version_requirements: *id002
|
@@ -42,6 +55,10 @@ dependencies:
|
|
42
55
|
requirements:
|
43
56
|
- - ~>
|
44
57
|
- !ruby/object:Gem::Version
|
58
|
+
hash: 29
|
59
|
+
segments:
|
60
|
+
- 0
|
61
|
+
- 11
|
45
62
|
version: "0.11"
|
46
63
|
type: :runtime
|
47
64
|
version_requirements: *id003
|
@@ -53,6 +70,9 @@ dependencies:
|
|
53
70
|
requirements:
|
54
71
|
- - ">="
|
55
72
|
- !ruby/object:Gem::Version
|
73
|
+
hash: 3
|
74
|
+
segments:
|
75
|
+
- 0
|
56
76
|
version: "0"
|
57
77
|
type: :development
|
58
78
|
version_requirements: *id004
|
@@ -113,17 +133,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
113
133
|
requirements:
|
114
134
|
- - ">="
|
115
135
|
- !ruby/object:Gem::Version
|
136
|
+
hash: 3
|
137
|
+
segments:
|
138
|
+
- 0
|
116
139
|
version: "0"
|
117
140
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
118
141
|
none: false
|
119
142
|
requirements:
|
120
143
|
- - ">="
|
121
144
|
- !ruby/object:Gem::Version
|
145
|
+
hash: 3
|
146
|
+
segments:
|
147
|
+
- 0
|
122
148
|
version: "0"
|
123
149
|
requirements: []
|
124
150
|
|
125
151
|
rubyforge_project: hornetseye
|
126
|
-
rubygems_version: 1.8.
|
152
|
+
rubygems_version: 1.8.15
|
127
153
|
signing_key:
|
128
154
|
specification_version: 3
|
129
155
|
summary: Graphical output under X.Org
|