Skip to content

Commit 8976f1f

Browse files
tootstoots
committed
Conflicts.
1 parent 0a6d7dd commit 8976f1f

File tree

16 files changed

+226
-0
lines changed
  • packages/liquidsoap
    • liquidsoap.2.0.2-1
    • liquidsoap.2.0.2
    • liquidsoap.2.0.3-1
    • liquidsoap.2.0.3
    • liquidsoap.2.0.4-1
    • liquidsoap.2.0.4-2
    • liquidsoap.2.0.4
    • liquidsoap.2.0.5
    • liquidsoap.2.0.6
    • liquidsoap.2.0.7
    • liquidsoap.2.1.0-1
    • liquidsoap.2.1.0
    • liquidsoap.2.1.1
    • liquidsoap.2.1.2
    • liquidsoap.2.1.3
    • liquidsoap.2.1.4

16 files changed

+226
-0
lines changed

‎packages/liquidsoap/liquidsoap.2.0.2-1/opam‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,21 @@ conflicts: [
9090
"faad" {< "0.5.0"}
9191
"fdkaac" {< "0.3.1"}
9292
"ffmpeg" {< "1.1.1"}
93+
"ffmpeg" {>= "1.1.8"}
94+
"ffmpeg-avutil" {< "1.1.1"}
95+
"ffmpeg-avutil" {>= "1.1.8"}
96+
"ffmpeg-av" {< "1.1.1"}
97+
"ffmpeg-av" {>= "1.1.8"}
98+
"ffmpeg-avcodec" {< "1.1.1"}
99+
"ffmpeg-avcodec" {>= "1.1.8"}
100+
"ffmpeg-avdevice" {< "1.1.1"}
101+
"ffmpeg-avdevice" {>= "1.1.8"}
102+
"ffmpeg-avfilter" {< "1.1.1"}
103+
"ffmpeg-avfilter" {>= "1.1.8"}
104+
"ffmpeg-swresample" {< "1.1.1"}
105+
"ffmpeg-swresample" {>= "1.1.8"}
106+
"ffmpeg-swscale" {< "1.1.1"}
107+
"ffmpeg-swscale" {>= "1.1.8"}
93108
"flac" {< "0.3.0" | >= "0.4.0"}
94109
"frei0r" {< "0.1.0"}
95110
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.2/opam‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,21 @@ conflicts: [
8484
"faad" {< "0.5.0"}
8585
"fdkaac" {< "0.3.1"}
8686
"ffmpeg" {< "1.1.1"}
87+
"ffmpeg" {>= "1.1.8"}
88+
"ffmpeg-avutil" {< "1.1.1"}
89+
"ffmpeg-avutil" {>= "1.1.8"}
90+
"ffmpeg-av" {< "1.1.1"}
91+
"ffmpeg-av" {>= "1.1.8"}
92+
"ffmpeg-avcodec" {< "1.1.1"}
93+
"ffmpeg-avcodec" {>= "1.1.8"}
94+
"ffmpeg-avdevice" {< "1.1.1"}
95+
"ffmpeg-avdevice" {>= "1.1.8"}
96+
"ffmpeg-avfilter" {< "1.1.1"}
97+
"ffmpeg-avfilter" {>= "1.1.8"}
98+
"ffmpeg-swresample" {< "1.1.1"}
99+
"ffmpeg-swresample" {>= "1.1.8"}
100+
"ffmpeg-swscale" {< "1.1.1"}
101+
"ffmpeg-swscale" {>= "1.1.8"}
87102
"flac" {< "0.3.0" | >= "0.4.0"}
88103
"frei0r" {< "0.1.0"}
89104
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.3-1/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.1"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.1"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.1"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.1"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.1"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.1"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.1"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.1"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.3/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.1"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.1"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.1"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.1"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.1"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.1"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.1"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.1"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.4-1/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.2"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.2"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.2"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.2"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.2"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.2"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.2"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.2"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.4-2/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.2"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.2"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.2"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.2"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.2"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.2"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.2"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.2"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.4/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.2"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.2"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.2"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.2"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.2"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.2"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.2"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.2"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.5/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.2"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.2"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.2"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.2"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.2"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.2"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.2"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.2"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.6/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.2"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.2"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.2"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.2"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.2"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.2"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.2"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.2"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

‎packages/liquidsoap/liquidsoap.2.0.7/opam‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,21 @@ conflicts: [
8787
"faad" {< "0.5.0"}
8888
"fdkaac" {< "0.3.1"}
8989
"ffmpeg" {< "1.1.2"}
90+
"ffmpeg" {>= "1.1.8"}
9091
"ffmpeg-avutil" {< "1.1.2"}
92+
"ffmpeg-avutil" {>= "1.1.8"}
93+
"ffmpeg-av" {< "1.1.2"}
94+
"ffmpeg-av" {>= "1.1.8"}
95+
"ffmpeg-avcodec" {< "1.1.2"}
96+
"ffmpeg-avcodec" {>= "1.1.8"}
97+
"ffmpeg-avdevice" {< "1.1.2"}
98+
"ffmpeg-avdevice" {>= "1.1.8"}
99+
"ffmpeg-avfilter" {< "1.1.2"}
100+
"ffmpeg-avfilter" {>= "1.1.8"}
101+
"ffmpeg-swresample" {< "1.1.2"}
102+
"ffmpeg-swresample" {>= "1.1.8"}
103+
"ffmpeg-swscale" {< "1.1.2"}
104+
"ffmpeg-swscale" {>= "1.1.8"}
91105
"flac" {< "0.3.0" | >= "0.4.0"}
92106
"frei0r" {< "0.1.0"}
93107
"gstreamer" {< "0.3.1"}

0 commit comments

Comments
 (0)