Skip to content

Commit 65143af

Browse files
SibrasSibras
committed
project: Update for 1.3.4 merge.
1 parent 4d18e6a commit 65143af

File tree

7 files changed

+58
-45
lines changed

7 files changed

+58
-45
lines changed

‎SMP/SMP.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ index 6155ad6a..a7e24757 100644
148148
if (lib_path) {
149149
/* cut library name from path */
150150
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
151-
index df449269..b7a02db6 100644
151+
index 359bc8f1..3b612d86 100644
152152
--- a/src/libbluray/bdj/bdj.c
153153
+++ b/src/libbluray/bdj/bdj.c
154154
@@ -49,6 +49,9 @@
@@ -225,7 +225,7 @@ index d45be33c..5a5a7ab6 100644
225225

226226
#define DEFAULT_LANGUAGE "eng"
227227
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
228-
index ee647392..e9d0c49d 100644
228+
index b3b55f75..04155b24 100644
229229
--- a/src/libbluray/bluray.c
230230
+++ b/src/libbluray/bluray.c
231231
@@ -58,6 +58,12 @@

‎SMP/libbluray.vcxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ rd /s /q "$(OutDir)"\include\libbluray
4747
cd ../
4848
cd $(ProjectDir)
4949
)
50-
if not exist .\src\libbluray-j2se-1.3.3.jar (
50+
if not exist .\src\libbluray-j2se-1.3.4.jar (
5151
del .\src\*.jar
52-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
52+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
5353
rd /s /q $(IntDir)\jar
5454
cd ../
5555
cd $(ProjectDir)
@@ -113,9 +113,9 @@ rd /s /q "$(OutDir)"\include\libbluray
113113
cd ../
114114
cd $(ProjectDir)
115115
)
116-
if not exist .\src\libbluray-j2se-1.3.3.jar (
116+
if not exist .\src\libbluray-j2se-1.3.4.jar (
117117
del .\src\*.jar
118-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
118+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
119119
rd /s /q $(IntDir)\jar
120120
cd ../
121121
cd $(ProjectDir)
@@ -180,9 +180,9 @@ rd /s /q "$(OutDir)"\include\libbluray
180180
cd ../
181181
cd $(ProjectDir)
182182
)
183-
if not exist .\src\libbluray-j2se-1.3.3.jar (
183+
if not exist .\src\libbluray-j2se-1.3.4.jar (
184184
del .\src\*.jar
185-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
185+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
186186
rd /s /q $(IntDir)\jar
187187
cd ../
188188
cd $(ProjectDir)
@@ -247,9 +247,9 @@ rd /s /q "$(OutDir)"\include\libbluray
247247
cd ../
248248
cd $(ProjectDir)
249249
)
250-
if not exist .\src\libbluray-j2se-1.3.3.jar (
250+
if not exist .\src\libbluray-j2se-1.3.4.jar (
251251
del .\src\*.jar
252-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
252+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
253253
rd /s /q $(IntDir)\jar
254254
cd ../
255255
cd $(ProjectDir)
@@ -313,9 +313,9 @@ rd /s /q "$(OutDir)"\include\libbluray
313313
cd ../
314314
cd $(ProjectDir)
315315
)
316-
if not exist .\src\libbluray-j2se-1.3.3.jar (
316+
if not exist .\src\libbluray-j2se-1.3.4.jar (
317317
del .\src\*.jar
318-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
318+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
319319
rd /s /q $(IntDir)\jar
320320
cd ../
321321
cd $(ProjectDir)
@@ -379,9 +379,9 @@ rd /s /q "$(OutDir)"\include\libbluray
379379
cd ../
380380
cd $(ProjectDir)
381381
)
382-
if not exist .\src\libbluray-j2se-1.3.3.jar (
382+
if not exist .\src\libbluray-j2se-1.3.4.jar (
383383
del .\src\*.jar
384-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
384+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
385385
rd /s /q $(IntDir)\jar
386386
cd ../
387387
cd $(ProjectDir)
@@ -446,9 +446,9 @@ rd /s /q "$(OutDir)"\include\libbluray
446446
cd ../
447447
cd $(ProjectDir)
448448
)
449-
if not exist .\src\libbluray-j2se-1.3.3.jar (
449+
if not exist .\src\libbluray-j2se-1.3.4.jar (
450450
del .\src\*.jar
451-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
451+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
452452
rd /s /q $(IntDir)\jar
453453
cd ../
454454
cd $(ProjectDir)
@@ -513,9 +513,9 @@ rd /s /q "$(OutDir)"\include\libbluray
513513
cd ../
514514
cd $(ProjectDir)
515515
)
516-
if not exist .\src\libbluray-j2se-1.3.3.jar (
516+
if not exist .\src\libbluray-j2se-1.3.4.jar (
517517
del .\src\*.jar
518-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
518+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
519519
rd /s /q $(IntDir)\jar
520520
cd ../
521521
cd $(ProjectDir)
@@ -580,9 +580,9 @@ rd /s /q "$(OutDir)"\include\libbluray
580580
cd ../
581581
cd $(ProjectDir)
582582
)
583-
if not exist .\src\libbluray-j2se-1.3.3.jar (
583+
if not exist .\src\libbluray-j2se-1.3.4.jar (
584584
del .\src\*.jar
585-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
585+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
586586
rd /s /q $(IntDir)\jar
587587
cd ../
588588
cd $(ProjectDir)
@@ -647,9 +647,9 @@ rd /s /q "$(OutDir)"\include\libbluray
647647
cd ../
648648
cd $(ProjectDir)
649649
)
650-
if not exist .\src\libbluray-j2se-1.3.3.jar (
650+
if not exist .\src\libbluray-j2se-1.3.4.jar (
651651
del .\src\*.jar
652-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
652+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
653653
rd /s /q $(IntDir)\jar
654654
cd ../
655655
cd $(ProjectDir)

‎SMP/libbluray_winrt.vcxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ rd /s /q "$(OutDir)"\include\libbluray
4848
cd ../
4949
cd $(ProjectDir)
5050
)
51-
if not exist .\src\libbluray-j2se-1.3.3.jar (
51+
if not exist .\src\libbluray-j2se-1.3.4.jar (
5252
del .\src\*.jar
53-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
53+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
5454
rd /s /q $(IntDir)\jar
5555
cd ../
5656
cd $(ProjectDir)
@@ -115,9 +115,9 @@ rd /s /q "$(OutDir)"\include\libbluray
115115
cd ../
116116
cd $(ProjectDir)
117117
)
118-
if not exist .\src\libbluray-j2se-1.3.3.jar (
118+
if not exist .\src\libbluray-j2se-1.3.4.jar (
119119
del .\src\*.jar
120-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
120+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
121121
rd /s /q $(IntDir)\jar
122122
cd ../
123123
cd $(ProjectDir)
@@ -182,9 +182,9 @@ rd /s /q "$(OutDir)"\include\libbluray
182182
cd ../
183183
cd $(ProjectDir)
184184
)
185-
if not exist .\src\libbluray-j2se-1.3.3.jar (
185+
if not exist .\src\libbluray-j2se-1.3.4.jar (
186186
del .\src\*.jar
187-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
187+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
188188
rd /s /q $(IntDir)\jar
189189
cd ../
190190
cd $(ProjectDir)
@@ -249,9 +249,9 @@ rd /s /q "$(OutDir)"\include\libbluray
249249
cd ../
250250
cd $(ProjectDir)
251251
)
252-
if not exist .\src\libbluray-j2se-1.3.3.jar (
252+
if not exist .\src\libbluray-j2se-1.3.4.jar (
253253
del .\src\*.jar
254-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
254+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
255255
rd /s /q $(IntDir)\jar
256256
cd ../
257257
cd $(ProjectDir)
@@ -316,9 +316,9 @@ rd /s /q "$(OutDir)"\include\libbluray
316316
cd ../
317317
cd $(ProjectDir)
318318
)
319-
if not exist .\src\libbluray-j2se-1.3.3.jar (
319+
if not exist .\src\libbluray-j2se-1.3.4.jar (
320320
del .\src\*.jar
321-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
321+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
322322
rd /s /q $(IntDir)\jar
323323
cd ../
324324
cd $(ProjectDir)
@@ -383,9 +383,9 @@ rd /s /q "$(OutDir)"\include\libbluray
383383
cd ../
384384
cd $(ProjectDir)
385385
)
386-
if not exist .\src\libbluray-j2se-1.3.3.jar (
386+
if not exist .\src\libbluray-j2se-1.3.4.jar (
387387
del .\src\*.jar
388-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
388+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
389389
rd /s /q $(IntDir)\jar
390390
cd ../
391391
cd $(ProjectDir)
@@ -450,9 +450,9 @@ rd /s /q "$(OutDir)"\include\libbluray
450450
cd ../
451451
cd $(ProjectDir)
452452
)
453-
if not exist .\src\libbluray-j2se-1.3.3.jar (
453+
if not exist .\src\libbluray-j2se-1.3.4.jar (
454454
del .\src\*.jar
455-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
455+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
456456
rd /s /q $(IntDir)\jar
457457
cd ../
458458
cd $(ProjectDir)
@@ -517,9 +517,9 @@ rd /s /q "$(OutDir)"\include\libbluray
517517
cd ../
518518
cd $(ProjectDir)
519519
)
520-
if not exist .\src\libbluray-j2se-1.3.3.jar (
520+
if not exist .\src\libbluray-j2se-1.3.4.jar (
521521
del .\src\*.jar
522-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
522+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
523523
rd /s /q $(IntDir)\jar
524524
cd ../
525525
cd $(ProjectDir)
@@ -584,9 +584,9 @@ rd /s /q "$(OutDir)"\include\libbluray
584584
cd ../
585585
cd $(ProjectDir)
586586
)
587-
if not exist .\src\libbluray-j2se-1.3.3.jar (
587+
if not exist .\src\libbluray-j2se-1.3.4.jar (
588588
del .\src\*.jar
589-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
589+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
590590
rd /s /q $(IntDir)\jar
591591
cd ../
592592
cd $(ProjectDir)
@@ -651,9 +651,9 @@ rd /s /q "$(OutDir)"\include\libbluray
651651
cd ../
652652
cd $(ProjectDir)
653653
)
654-
if not exist .\src\libbluray-j2se-1.3.3.jar (
654+
if not exist .\src\libbluray-j2se-1.3.4.jar (
655655
del .\src\*.jar
656-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.3
656+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.4
657657
rd /s /q $(IntDir)\jar
658658
cd ../
659659
cd $(ProjectDir)

SMP/src/libbluray-awt-j2se-1.3.3.jar renamed to SMP/src/libbluray-awt-j2se-1.3.4.jar

71.3 KB
Binary file not shown.

SMP/src/libbluray-j2se-1.3.3.jar renamed to SMP/src/libbluray-j2se-1.3.4.jar

754 KB
Binary file not shown.

‎SMP/src/libbluray/bluray-version.h‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,33 @@
1717
* <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
/**
21+
* @file
22+
* \brief libbluray API version
23+
*/
24+
2025
#ifndef BLURAY_VERSION_H_
2126
#define BLURAY_VERSION_H_
2227

28+
/** Pack version number to single integer */
2329
#define BLURAY_VERSION_CODE(major, minor, micro) \
2430
(((major) * 10000) + \
2531
((minor) * 100) + \
2632
((micro) * 1))
2733

34+
/** libbluray major version number */
2835
#define BLURAY_VERSION_MAJOR 1
36+
37+
/** libbluray minor version number */
2938
#define BLURAY_VERSION_MINOR 3
30-
#define BLURAY_VERSION_MICRO 3
3139

32-
#define BLURAY_VERSION_STRING "1.3.3"
40+
/** libbluray micro version number */
41+
#define BLURAY_VERSION_MICRO 4
42+
43+
/** libbluray version number as a string */
44+
#define BLURAY_VERSION_STRING "1.3.4"
3345

46+
/** libbluray version number as a single integer */
3447
#define BLURAY_VERSION \
3548
BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
3649

‎SMP/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/* Version number of package */
2-
#define VERSION "1.3.3"
2+
#define VERSION "1.3.4"

0 commit comments

Comments
 (0)