← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vlc/maverick

« back to all changes in this revision

Viewing changes to extras/contrib/src/Patches/x264-svn-win32.patch

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-09-17 21:56:14 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20080917215614-tj0vx8xzd57e52t8
Tags: 0.9.2-1ubuntu1
https://launchpad.net/bugs/270404
https://launchpad.net/bugs/210354
https://launchpad.net/bugs/199870
https://launchpad.net/bugs/261567
* New Upstream Release, exception granted by
    - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404

Changes done in ubuntu:

* add libxul-dev to build-depends
* make sure that vlc is build against libxul in configure. This doesn't
  change anything in the package, but makes it more robust if building
  in an 'unclean' chroot or when modifying the package.
* debian/control: make Vcs-* fields point to the motumedia branch
* add libx264-dev and libass-dev to build-depends
  LP: #210354, #199870
* actually enable libass support by passing --enable-libass to configure
* enable libdca: add libdca-dev to build depends and --enable-libdca
* install the x264 plugin.

Changes already in the pkg-multimedia branch in debian:

* don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install  
* new upstream .desktop file now registers flash video mimetype LP: #261567
* add Xb-Npp-Applications to mozilla-plugin-vlc
* remove duplicate entries in debian/vlc-nox.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
extras/contrib/src/Patches/x264-svn-win32.patch
1
 
Index: configure
2
 
===================================================================
3
 
--- configure   (revision 736)
4
 
+++ configure   (working copy)
5
 
@@ -338,6 +338,7 @@
 
1
--- configure   2008-04-06 09:07:25.000000000 +0200
 
2
+++ configure   2008-04-06 09:10:52.000000000 +0200
 
3
@@ -343,6 +343,7 @@
6
4
 # autodetect options that weren't forced nor disabled
7
5
 
8
6
 libpthread=""
10
8
 if test "$pthread" = "auto" ; then
11
9
     pthread="no"
12
10
     case $SYS in
13
 
@@ -345,16 +346,18 @@
 
11
@@ -350,13 +351,13 @@
14
12
             pthread="yes"
15
13
             ;;
16
 
         MINGW|CYGWIN)
 
14
         MINGW)
17
15
-            if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then
18
16
+            if cc_check pthread.h -lpthread "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
19
17
                 pthread="yes"
20
18
                 libpthread="-lpthread"
21
19
-            elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then
22
 
+            elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
 
20
+            elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0); pthread_num_processors_np(); " ; then
23
21
                 pthread="yes"
24
22
                 libpthread="-lpthreadGC2"
25
23
-            elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then
27
25
                 pthread="yes"
28
26
                 libpthread="-lpthreadGC2 -lwsock32"
29
27
                 CFLAGS="$CFLAGS -DPTW32_STATIC_LIB"
30
 
+               extradef="-DPTW32_STATIC_LIB"
31
 
+
32
 
             fi
33
 
             ;;
34
 
         *)
35
 
@@ -438,6 +441,10 @@
 
28
@@ -443,6 +444,10 @@
36
29
 ASFLAGS=$ASFLAGS
37
30
 GTK=$gtk
38
31
 EXE=$EXE
43
36
 VIS=$vis
44
37
 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
45
38
 DEVNULL=$DEVNULL
46
 
@@ -480,7 +487,7 @@
 
39
@@ -495,7 +500,7 @@
47
40
 Description: H.264 (MPEG4 AVC) encoder library
48
41
 Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
49
42
 Libs: $pclibs
52
45
 EOF
53
46
 
54
47
 
55
 
Index: Makefile
56
 
===================================================================
57
 
--- Makefile    (revision 736)
58
 
+++ Makefile    (working copy)
59
 
@@ -74,8 +74,8 @@
 
48
--- Makefile    2008-04-06 09:07:25.000000000 +0200
 
49
+++ Makefile    2008-04-06 09:11:39.000000000 +0200
 
50
@@ -72,8 +72,8 @@
60
51
 default: $(DEP) x264$(EXE)
61
52
 
62
53
 libx264.a: .depend $(OBJS) $(OBJASM)
66
57
+       $(RANLIB) libx264.a
67
58
 
68
59
 $(SONAME): .depend $(OBJS) $(OBJASM)
69
 
        $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
70
 
@@ -94,7 +94,7 @@
 
60
        $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
 
61
@@ -90,7 +90,7 @@
71
62
 %.o: %.asm
72
63
        $(AS) $(ASFLAGS) -o $@ $<
73
64
 # delete local/anonymous symbols, so they don't show up in oprofile
76
67
 
77
68
 .depend: config.mak
78
69
        rm -f .depend
79
 
@@ -149,14 +149,14 @@
80
 
        rm -rf test/
81
 
        $(MAKE) -C gtk distclean
82
 
 
83
 
-install: x264 $(SONAME)
84
 
+install: x264$(EXE)
85
 
        install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
86
 
        install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
87
 
        install -m 644 x264.h $(DESTDIR)$(includedir)
 
70
@@ -155,7 +155,7 @@
88
71
        install -m 644 libx264.a $(DESTDIR)$(libdir)
89
72
        install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
90
 
-       install x264 $(DESTDIR)$(bindir)
 
73
        install x264$(EXE) $(DESTDIR)$(bindir)
91
74
-       ranlib $(DESTDIR)$(libdir)/libx264.a
92
 
+       install x264$(EXE) $(DESTDIR)$(bindir)
93
75
+       $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
94
 
        $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
95
 
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
96
 
 
 
76
 ifeq ($(SYS),MINGW)
 
77
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
 
78
 else